1996-11-15
1996-11-15 04:30:49 by Per Hedbor <ph@opera.com>
-
e4bc53118539cea856c9a666d296e4858413723a
(39 lines)
(+20/-19)
[
Show
| Annotate
]
Branch: 5.2
Fixed the 'load' function, so that it no longer will use the cache in
master.pike when loading modules. The reason for this is that this
made 'reload' in the configuration interface quite useless, since the
only thing it did was 'reinit'.
Also removed a few proxy variables, and added a new one, number of
directories to hash into.
Rev: server/base_server/roxen.pike:1.6
1515: Inside #if defined(MODULE_LEVEL_SECURITY)
// I will remove this in a future version of roxen.
private program __p;
program last_loaded() { return __p; }
- object load(string s)
+ object load(string s) // Should perhaps be renamed to 'reload'.
{
if(file_size(s+".pike")>0)
- if(__p=(program)(s+".pike")) return __p();
+ if(__p=compile_file(s+".pike")) return __p();
if(file_size(s+".lpc")>0)
- if(__p=(program)(s+".lpc")) return __p();
+ if(__p=compile_file(s+".lpc")) return __p();
if(file_size(s+".module")>0)
- if(__p=(program)(s+".module")) return __p();
- #if 0
- if(file_size(s)>0)
- if(__p=(program)(s)) return __p();
- if(file_size(s+".so")>0) // Loadable C-library.. TBD
- ; /* */
- #endif
+ if(__p=compile_file(s+".module")) return __p();
return 0; // FAILED..
}
2421:
globvar("_v", CONFIGURATION_FILE_LEVEL, 0, TYPE_INT, 0, 0, 1);
+
+ globvar("logdirprefix", "../logs/", "Log directory prefix", TYPE_DIR,
+ "This is the default file path that will be prepended to the log "
+ " file path in all the default modules and the virtual server.");
+
+
// Cache variables. The actual code recides in the file
// 'disk_cache.pike'
2458:
"variable.",
0, cache_disabled_p);
- globvar("logdirprefix", "../logs/", "Log directory prefix", TYPE_DIR,
- "This is the default file path that will be prepended to the log "
- " file path in all the default modules and the virtual server.");
+ globvar("hash_num_dirs", 500,
+ "Proxy disk cache: Number of hash directories",
+ TYPE_INT,
+ "This is the number of directories to hash the contents of the disk "
+ "cache into. Changing this value currently invalidates the whole "
+ "cache, since the cache cannot find the old files. In the future, "
+ " the cache will be recalculated when this value is changed.");
- globvar("cachefname", "Hash", "Proxy disk cache: File name method",
- TYPE_STRING_LIST, "Hash is fastest and has the smallest "
- "overhead, hierarchy is easiest to browse manually.",
- ({ "Hash", "Flat", "Hierarchy" }),
- cache_disabled_p);
+ /// End of cache variables..
globvar("docurl", "http://roxen.com", "Documentation URL",
TYPE_STRING,