Author: rjung
Date: Sat Nov 24 05:57:04 2007
New Revision: 597848
URL: http://svn.apache.org/viewvc?rev=597848&view=rev
Log:
Provide a forced mode of checking uriworkermap.properties
file. Will be used in status worker soon.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.h
Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c?rev=597848&r1=597847&r2=597848&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.c Sat Nov 24
05:57:04 2007
@@ -611,7 +611,7 @@
return NULL;
}
if (uw_map->fname) {
- uri_worker_map_update(uw_map, l);
+ uri_worker_map_update(uw_map, 0, l);
if (!uw_map->size) {
jk_log(l, JK_LOG_INFO,
"No worker maps defined for %s.",
@@ -760,12 +760,13 @@
}
int uri_worker_map_update(jk_uri_worker_map_t *uw_map,
- jk_logger_t *l)
+ int force, jk_logger_t *l)
{
int rc = JK_TRUE;
time_t now = time(NULL);
- if (uw_map->reload > 0 && difftime(now, uw_map->checked) > uw_map->reload)
{
+ if ((uw_map->reload > 0 && difftime(now, uw_map->checked) >
uw_map->reload) ||
+ force) {
struct stat statbuf;
uw_map->checked = now;
if ((rc = jk_stat(uw_map->fname, &statbuf)) == -1) {
Modified: tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.h?rev=597848&r1=597847&r2=597848&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_uri_worker_map.h Sat Nov 24
05:57:04 2007
@@ -148,7 +148,7 @@
jk_logger_t *l);
int uri_worker_map_update(jk_uri_worker_map_t *uw_map,
- jk_logger_t *l);
+ int force, jk_logger_t *l);
#ifdef __cplusplus
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
