tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r745898 - in /tomcat/connectors/trunk/jk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml
Date Thu, 19 Feb 2009 15:28:48 GMT
Author: mturk
Date: Thu Feb 19 15:28:47 2009
New Revision: 745898

URL: http://svn.apache.org/viewvc?rev=745898&view=rev
Log:
Update uriworkermap on watchog interval

Modified:
    tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
    tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=745898&r1=745897&r2=745898&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Thu Feb 19 15:28:47 2009
@@ -2377,6 +2377,11 @@
             jk_log(logger, JK_LOG_DEBUG,
                    "Watchdog thread running");
         }
+        if (worker_mount_file[0]) {
+            jk_shm_lock();
+            uri_worker_map_update(uw_map, 0, logger);
+            jk_shm_unlock();
+        }
         wc_maintain(logger);
     }
     if (JK_IS_DEBUG_LEVEL(logger)) {
@@ -2499,10 +2504,11 @@
             uw_map->reject_unsafe = 1;
         else
             uw_map->reject_unsafe = 0;
-        uw_map->fname = worker_mount_file;
         uw_map->reload = worker_mount_reload;
-        if (worker_mount_file[0])
+        if (worker_mount_file[0]) {
+            uw_map->fname = worker_mount_file;
             rc = uri_worker_map_load(uw_map, logger);
+        }
     }
     if (rc) {
         rc = JK_FALSE;

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=745898&r1=745897&r2=745898&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Thu Feb 19 15:28:47 2009
@@ -44,6 +44,11 @@
   <subsection name="Native">
     <changelog>
       <update>
+      IIS: Update uriworkermap.properies file on
+      a regular interval. This requires both worker_mount_reload
+      and watchog_interval to be defined. (mturk)
+      </update>
+      <update>
       AJP: Allow changing worker address via jkstatus
       manager. The address is resolved on next request
       for that worker. (mturk)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message