tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r550245 - in /tomcat/connectors/trunk/jk: jkstatus/src/share/org/apache/jk/status/ jkstatus/test/src/share/org/apache/jk/status/ xdocs/miscellaneous/
Date Sun, 24 Jun 2007 15:05:55 GMT
Author: rjung
Date: Sun Jun 24 08:05:54 2007
New Revision: 550245

URL: http://svn.apache.org/viewvc?view=rev&rev=550245
Log:
JkStatus: Added OK/IDLE as the successor of N/A.

Modified:
    tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
    tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
    tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java
    tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java?view=diff&rev=550245&r1=550244&r2=550245
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
(original)
+++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusParser.java
Sun Jun 24 08:05:54 2007
@@ -127,6 +127,11 @@
  *
  *
  * </code>
+ * <br/>
+ * mod_jk 1.2.24 runtime state N/A changed to OK/IDLE:<br/>
+ * <code>
+ *        state="OK/IDLE"
+ * </code>
  * @author Peter Rossbach
  * @version $Revision$ $Date$
  * @since 5.5.10

Modified: tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java?view=diff&rev=550245&r1=550244&r2=550245
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java (original)
+++ tomcat/connectors/trunk/jk/jkstatus/src/share/org/apache/jk/status/JkStatusTask.java Sun
Jun 24 08:05:54 2007
@@ -258,7 +258,10 @@
                                         + " status=" + member.getStatus()
                                         + " host=" + member.getAddress());
                             }
-                            if (member.getState() != null && !("OK".equals(member.getState())
|| "N/A".equals(member.getState())) ){
+                            if (member.getState() != null &&
+                                !("OK".equals(member.getState()) ||
+                                  "N/A".equals(member.getState()) ||
+                                  "OK/IDLE".equals(member.getState())) ){
                                 error.append(" worker name=" + member.getName()
                                         + " state=" + member.getState()
                                         + " host=" + member.getAddress());

Modified: tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java?view=diff&rev=550245&r1=550244&r2=550245
==============================================================================
--- tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java
(original)
+++ tomcat/connectors/trunk/jk/jkstatus/test/src/share/org/apache/jk/status/JkStatusParserTest.java
Sun Jun 24 08:05:54 2007
@@ -36,8 +36,8 @@
          +   "<jk:server name=\"localhost\" port=\"80\" software=\"Apache/2.0.58 (Unix)
mod_jk/1.2.19\" version=\"1.2.19\" />"
          +   "<jk:balancers>"
          +   "<jk:balancer id=\"0\" name=\"loadbalancer\" type=\"lb\" sticky=\"True\"
stickyforce=\"False\" retries=\"2\" recover=\"60\" >"
-         +   "<jk:member id=\"0\" name=\"node1\" type=\"ajp13\" host=\"localhost\" port=\"9012\"
address=\"127.0.0.1:9012\" activation=\"ACT\" state=\"N/A\" distance=\"0\" lbfactor=\"1\"
lbmult=\"1\" lbvalue=\"0\" elected=\"0\" errors=\"0\" transferred=\"0\" readed=\"0\" busy=\"0\"
maxbusy=\"0\" jvm_route=\"node1\" />"
-         +   "<jk:member id=\"0\" name=\"node2\" type=\"ajp13\" host=\"localhost\" port=\"9022\"
address=\"127.0.0.1:9022\" activation=\"ACT\" state=\"N/A\" distance=\"0\" lbfactor=\"1\"
lbmult=\"1\" lbvalue=\"0\" elected=\"0\" errors=\"0\" transferred=\"0\" readed=\"0\" busy=\"0\"
maxbusy=\"0\" jvm_route=\"node2\" />"
+         +   "<jk:member id=\"0\" name=\"node1\" type=\"ajp13\" host=\"localhost\" port=\"9012\"
address=\"127.0.0.1:9012\" activation=\"ACT\" state=\"OK/IDLE\" distance=\"0\" lbfactor=\"1\"
lbmult=\"1\" lbvalue=\"0\" elected=\"0\" errors=\"0\" transferred=\"0\" readed=\"0\" busy=\"0\"
maxbusy=\"0\" jvm_route=\"node1\" />"
+         +   "<jk:member id=\"0\" name=\"node2\" type=\"ajp13\" host=\"localhost\" port=\"9022\"
address=\"127.0.0.1:9022\" activation=\"ACT\" state=\"OK/IDLE\" distance=\"0\" lbfactor=\"1\"
lbmult=\"1\" lbvalue=\"0\" elected=\"0\" errors=\"0\" transferred=\"0\" readed=\"0\" busy=\"0\"
maxbusy=\"0\" jvm_route=\"node2\" />"
          +   "<jk:map type=\"Wildchar\" uri=\"/ClusterTest/*\" context=\"/ClusterTest/*\"
/>"
          +   "<jk:map type=\"Exact\" uri=\"/ClusterTest\" context=\"/ClusterTest\" />"
          +   "<jk:map type=\"Wildchar\" uri=\"/myapps/*\" context=\"/myapps/*\" />"
@@ -59,4 +59,4 @@
         assertEquals(4,balancer.getBalancerMappings().size());
 	}
 
-}
\ No newline at end of file
+}

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=550245&r1=550244&r2=550245
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sun Jun 24 08:05:54 2007
@@ -28,6 +28,9 @@
   <subsection name="Native">
     <changelog>
       <update>
+      JkStatus: Added OK/IDLE as the successor of N/A. (rjung)
+      </update>
+      <update>
       Status worker: Renamed runtime states. All states have a major
       state (OK or ERR) and a substate. Changed the name N/A to OK/IDLE.
       Added docs about the meaning of the states to the status worker



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


Mime
View raw message