Author: jfrederic.clere(a)jboss.com
Date: 2008-07-16 05:40:04 -0400 (Wed, 16 Jul 2008)
New Revision: 1750
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Arrange default value for MemManagerFile
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-07-11 15:01:38 UTC (rev 1749)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-07-16 09:40:04 UTC (rev 1750)
@@ -277,10 +277,10 @@
host = apr_pstrcat(ptemp, mconf->basefilename, ".host", NULL);
balancer = apr_pstrcat(ptemp, mconf->basefilename, ".balancer",
NULL);
} else {
- node = "manager.node";
- context = "manager.context";
- host = "manager.host";
- host = "manager.balancer";
+ node = ap_server_root_relative(ptemp, "logs/manager.node");
+ context = ap_server_root_relative(ptemp, "logs/manager.context");
+ host = ap_server_root_relative(ptemp, "logs/manager.host");
+ balancer = ap_server_root_relative(ptemp, "logs/manager.balancer");
}
/* Get a provider to handle the shared memory */
@@ -1187,10 +1187,10 @@
host = apr_pstrcat(p, mconf->basefilename, ".host", NULL);
balancer = apr_pstrcat(p, mconf->basefilename, ".balancer", NULL);
} else {
- node = "manager.node";
- context = "manager.context";
- host = "manager.host";
- balancer = "manager.balancer";
+ node = ap_server_root_relative(p, "logs/manager.node");
+ context = ap_server_root_relative(p, "logs/manager.context");
+ host = ap_server_root_relative(p, "logs/manager.host");
+ balancer = ap_server_root_relative(p, "logs/manager.balancer");
}
nodestatsmem = get_mem_node(node, &mconf->maxnode, p, storage);
@@ -1243,6 +1243,8 @@
{
mod_manager_config *mconf = ap_get_module_config(cmd->server->module_config,
&manager_module);
mconf->basefilename = apr_pstrdup(cmd->pool, word);
+ if (apr_dir_make_recursive(mconf->basefilename, APR_UREAD | APR_UWRITE |
APR_UEXECUTE, cmd->pool) != APR_SUCCESS)
+ return "Can't create directory corresponding to MemManagerFile";
return NULL;
}
static const char *cmd_manager_balancername(cmd_parms *cmd, void *mconfig, const char
*word)
Show replies by date