tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r611675 - in /tomcat/connectors/trunk/jk: native/common/jk_status.c xdocs/miscellaneous/changelog.xml xdocs/reference/status.xml
Date Sun, 13 Jan 2008 23:31:36 GMT
Author: rjung
Date: Sun Jan 13 15:31:32 2008
New Revision: 611675

URL: http://svn.apache.org/viewvc?rev=611675&view=rev
Log:
Change parameter names of update action in status worker to
make them more easily distinguishable from other parameters.

Modified:
    tomcat/connectors/trunk/jk/native/common/jk_status.c
    tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
    tomcat/connectors/trunk/jk/xdocs/reference/status.xml

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=611675&r1=611674&r2=611675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sun Jan 13 15:31:32 2008
@@ -71,13 +71,13 @@
 #define JK_STATUS_ARG_OPTION_NO_AJP        0x0010
 #define JK_STATUS_ARG_OPTION_READ_ONLY     0x0020
 
-#define JK_STATUS_ARG_LB_RETRIES           ("lr")
-#define JK_STATUS_ARG_LB_RECOVER_TIME      ("lt")
-#define JK_STATUS_ARG_LB_MAX_REPLY_TIMEOUTS ("lx")
-#define JK_STATUS_ARG_LB_STICKY            ("ls")
-#define JK_STATUS_ARG_LB_STICKY_FORCE      ("lf")
-#define JK_STATUS_ARG_LB_METHOD            ("lm")
-#define JK_STATUS_ARG_LB_LOCK              ("ll")
+#define JK_STATUS_ARG_LB_RETRIES           ("vlr")
+#define JK_STATUS_ARG_LB_RECOVER_TIME      ("vlt")
+#define JK_STATUS_ARG_LB_MAX_REPLY_TIMEOUTS ("vlx")
+#define JK_STATUS_ARG_LB_STICKY            ("vls")
+#define JK_STATUS_ARG_LB_STICKY_FORCE      ("vlf")
+#define JK_STATUS_ARG_LB_METHOD            ("vlm")
+#define JK_STATUS_ARG_LB_LOCK              ("vll")
 
 #define JK_STATUS_ARG_LB_TEXT_RETRIES      "Retries"
 #define JK_STATUS_ARG_LB_TEXT_RECOVER_TIME "Recover Wait Time"
@@ -87,12 +87,12 @@
 #define JK_STATUS_ARG_LB_TEXT_METHOD       "LB Method"
 #define JK_STATUS_ARG_LB_TEXT_LOCK         "Locking"
 
-#define JK_STATUS_ARG_LBM_ACTIVATION       ("wa")
-#define JK_STATUS_ARG_LBM_FACTOR           ("wf")
-#define JK_STATUS_ARG_LBM_ROUTE            ("wn")
-#define JK_STATUS_ARG_LBM_REDIRECT         ("wr")
-#define JK_STATUS_ARG_LBM_DOMAIN           ("wc")
-#define JK_STATUS_ARG_LBM_DISTANCE         ("wd")
+#define JK_STATUS_ARG_LBM_ACTIVATION       ("vwa")
+#define JK_STATUS_ARG_LBM_FACTOR           ("vwf")
+#define JK_STATUS_ARG_LBM_ROUTE            ("vwn")
+#define JK_STATUS_ARG_LBM_REDIRECT         ("vwr")
+#define JK_STATUS_ARG_LBM_DOMAIN           ("vwc")
+#define JK_STATUS_ARG_LBM_DISTANCE         ("vwd")
 
 #define JK_STATUS_ARG_LBM_TEXT_ACTIVATION  "Activation"
 #define JK_STATUS_ARG_LBM_TEXT_FACTOR      "LB Factor"
@@ -965,7 +965,7 @@
                   JK_STATUS_ARG_WORKER, worker);
         started=1;
     }
-    if (sub_worker && sub_worker[0]) {
+    if (sub_worker && sub_worker[0] && cmd != JK_STATUS_CMD_LIST) {
         jk_printf(s, "%s%s=%s", started ? "&" : "?",
                   JK_STATUS_ARG_SUB_WORKER, sub_worker);
         started=1;
@@ -992,7 +992,7 @@
         if (!strcmp(k, JK_STATUS_ARG_WORKER) && worker) {
             continue;
         }
-        if (!strcmp(k, JK_STATUS_ARG_SUB_WORKER) && sub_worker) {
+        if (!strcmp(k, JK_STATUS_ARG_SUB_WORKER) && (sub_worker || cmd == JK_STATUS_CMD_LIST))
{
             continue;
         }
         if (!strcmp(k, JK_STATUS_ARG_ATTRIBUTE) && attribute) {
@@ -1004,7 +1004,7 @@
         if (!strncmp(k, JK_STATUS_ARG_MULT_VALUE_BASE, 3) && cmd != JK_STATUS_CMD_UPDATE)
{
             continue;
         }
-        if (strlen(k) == 2 && (k[0] == 'l' || k[0] == 'w') && cmd != JK_STATUS_CMD_UPDATE)
{
+        if (k[0] == 'v' && cmd != JK_STATUS_CMD_UPDATE) {
             continue;
         }
         if (!strcmp(k, JK_STATUS_ARG_OPTIONS)) {

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=611675&r1=611674&r2=611675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sun Jan 13 15:31:32 2008
@@ -44,6 +44,10 @@
   <subsection name="Native">
     <changelog>
       <update>
+        Status: Change parameter names of update action to
+        make them more easily distinguishable from other parameters. (rjung)
+      </update>
+      <update>
         Status: Add non ajp worker statistics also for
         workers, that are not lb members. (rjung)
       </update>

Modified: tomcat/connectors/trunk/jk/xdocs/reference/status.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/reference/status.xml?rev=611675&r1=611674&r2=611675&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/reference/status.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/reference/status.xml Sun Jan 13 15:31:32 2008
@@ -450,46 +450,46 @@
 contain the configuration information, you want to change. First the list for load balancer
workers:
 <ul>
 <li>
-<b>lr</b>: retries (number)
+<b>vlr</b>: retries (number)
 </li>
 <li>
-<b>lt</b>: recover_time (seconds)
+<b>vlt</b>: recover_time (seconds)
 </li>
 <li>
-<b>lx</b>: max_reply_timeouts (number)
+<b>vlx</b>: max_reply_timeouts (number)
 </li>
 <li>
-<b>ls</b>: sticky_session (0/f/n/off=off, 1/t/y/on=on; case insensitive)
+<b>vls</b>: sticky_session (0/f/n/off=off, 1/t/y/on=on; case insensitive)
 </li>
 <li>
-<b>lf</b>: sticky_session_force (0/f/n/off=off, 1/t/y/on=on; case insensitive)
+<b>vlf</b>: sticky_session_force (0/f/n/off=off, 1/t/y/on=on; case insensitive)
 </li>
 <li>
-<b>lm</b>: method (0/r="Requests", 1/t="Traffic", 2/b="Busyness", 3/s="Sessions";
case insensitive, only first character is used)
+<b>vlm</b>: method (0/r="Requests", 1/t="Traffic", 2/b="Busyness", 3/s="Sessions";
case insensitive, only first character is used)
 </li>
 <li>
-<b>ll</b>: lock (0/o="Optimistic", 1/p="Pessimistic"; case insensitive, only
first character is used)
+<b>vll</b>: lock (0/o="Optimistic", 1/p="Pessimistic"; case insensitive, only
first character is used)
 </li>
 </ul>
 And now the list of parameters you can use to change settings for load balancer members:
 <ul>
 <li>
-<b>wa</b>: activation flag (0/a="active", 1/d="disabled", 2/s="stopped"; case
insensitive, only first character is used)
+<b>vwa</b>: activation flag (0/a="active", 1/d="disabled", 2/s="stopped"; case
insensitive, only first character is used)
 </li>
 <li>
-<b>wf</b>: load balancing factor (integer weight)
+<b>vwf</b>: load balancing factor (integer weight)
 </li>
 <li>
-<b>wn</b>: route for use with sticky sessions (string)
+<b>vwn</b>: route for use with sticky sessions (string)
 </li>
 <li>
-<b>wr</b>: redirect to define simple failover rules (string)
+<b>vwr</b>: redirect to define simple failover rules (string)
 </li>
 <li>
-<b>wc</b>: domain to tell JK about your replication design (string)
+<b>vwc</b>: domain to tell JK about your replication design (string)
 </li>
 <li>
-<b>wd</b>: distance to express preferences (integer)
+<b>vwd</b>: distance to express preferences (integer)
 </li>
 </ul>
 For the details of all parameters, we refer to the <a href="workers.html">workers.properties
Reference</a>.
@@ -503,7 +503,7 @@
 configuration aspect for all members of a load balancer simultaneously, this
 will be triggered by the parameter <b>att</b>. The value of the parameter indicates,
 which aspect you want to edit. The list is the same as in the previous section:
-"wa", "wf", "wn", "wr", "wc" and "wd". But here you
+"vwa", "vwf", "vwn", "vwr", "vwc" and "vwd". But here you
 need to put the name into the parameter "att", instead of using it as a request
 parameter name.
 </p>



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


Mime
View raw message