mturk 2005/02/21 10:00:41
Modified: jk/native/apache-1.3 mod_jk.c
jk/native/apache-2.0 mod_jk.c
Log:
Add apache log warning if shared memory is not defined for
unix platforms. Although it will work, the dynamic config will be unavailable,
so inform the user about that fact.
Revision Changes Path
1.72 +7 -1 jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- mod_jk.c 21 Feb 2005 08:29:17 -0000 1.71
+++ mod_jk.c 21 Feb 2005 18:00:41 -0000 1.72
@@ -1985,6 +1985,12 @@
else
jk_log(conf->log, JK_LOG_ERROR, "Initializing shm:%s errno=%d",
jk_shm_name(), rc);
+#if !defined (WIN32) || !defined(NETWARE)
+ if (!jk_shm_file)
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, NULL,
+ "No JkShmFile defined in httpd.conf. "
+ "LoadBalancer will not function properly!");
+#endif
/* SREVILAK -- register cleanup handler to clear resources on restart,
* to make sure log file gets closed in the parent process */
1.129 +9 -2 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- mod_jk.c 21 Feb 2005 08:29:17 -0000 1.128
+++ mod_jk.c 21 Feb 2005 18:00:41 -0000 1.129
@@ -2348,6 +2348,13 @@
else
jk_log(conf->log, JK_LOG_ERROR, "Initializing shm:%s errno=%d",
jk_shm_name(), rc);
+#if !defined (WIN32) || !defined(NETWARE)
+ if (!jk_shm_file)
+ ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO,
+ 0, NULL,
+ "No JkShmFile defined in httpd.conf. "
+ "LoadBalancer will not function properly!");
+#endif
/* Set default connection cache size for worker mpm */
#if APR_HAS_THREADS
@@ -2392,7 +2399,7 @@
apr_status_t rv;
jk_server_conf_t *conf;
server_rec *srv = s;
-
+
/* create the jk log lockfiles in the parent */
if ((rv = apr_global_mutex_create(&jk_log_lock, NULL,
APR_LOCK_DEFAULT,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
