cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c

[jfclere]

jfclere     2004/05/26 01:10:05

  Modified:    jk/native2/common jk_worker_ajp13.c
  Log:
  - adds 'debug' into setAttribute() (it was already listed in setAttributeInfo[]),
  - adds 'max_connections' to 'setAttributeInfo[]' (it was already in setAttribute()),
  - adds 'max_connections' to 'getAttributeInfo[]',
  - adds 'max_connections' to 'getAttribute()',
  - re-orders getAttributeInfo[] and  setAttributeInfo[].
  Submitted by Norm (normw at bocnet.com.au) (http://normw.gknw.com)
  
  Revision  Changes    Path
  1.65      +21 -13    jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
  
  Index: jk_worker_ajp13.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- jk_worker_ajp13.c 21 Mar 2004 09:43:09 -0000      1.64
  +++ jk_worker_ajp13.c 26 May 2004 08:10:05 -0000      1.65
  @@ -35,23 +35,26 @@
   #include "jk_registry.h"
   
   /* -------------------- Impl -------------------- */
  -static char *jk2_worker_ajp13_getAttributeInfo[] =
  -    { "lb_factor", "lb_value", "debug", "channel", "level",
  -    "route", "routeRedirect", "errorState", "graceful", "groups", "disabled",
  -    "epCount", "errorTime", "connectTimeout", "replyTimeout",
  -    "prepostTimeout", NULL
  +/*
  + * Properties available to Get.
  + */
  +static char *jk2_worker_ajp13_getAttributeInfo[] = {
  +    "channel", "groups", "max_connections", "epCount", "level", "lb_factor",
  +    "lb_value", "route", "routeRedirect","graceful", "errorState", "errorTime",
  +    "connectTimeout", "replyTimeout", "prepostTimeout", "debug", "disabled", NULL
   };
   
   static char *jk2_worker_ajp13_multiValueInfo[] = { "group", NULL };
   
  -static char *jk2_worker_ajp13_setAttributeInfo[] =
  -    { "debug", "channel", "route", "routeRedirect", "secretkey", "group",
  -"graceful",
  -    "disabled", "lb_factor", "level", "connectTimeout", "replyTimeout",
  -    "prepostTimeout", NULL
  +/*
  + * Properties available to Set.
  + */
  +static char *jk2_worker_ajp13_setAttributeInfo[] = {
  +    "channel", "group", "secretkey", "max_connections", "level", "lb_factor",
  +    "route", "routeRedirect", "graceful", "connectTimeout", "replyTimeout",
  +    "prepostTimeout", "debug", "disabled", NULL
   };
   
  -
   static void *JK_METHOD jk2_worker_ajp13_getAttribute(jk_env_t *env,
                                                        jk_bean_t *bean,
                                                        char *name)
  @@ -76,6 +79,9 @@
       else if (strcmp(name, "groups") == 0) {
           return jk2_map_concatKeys(env, worker->groups, ":");
       }
  +    else if (strcmp(name, "max_connections") == 0) {
  +        return jk2_env_itoa(env, worker->maxEndpoints);
  +    }
       else if (strcmp(name, "level") == 0) {
           return jk2_env_itoa(env, worker->level);
       }
  @@ -116,9 +122,8 @@
       }
   }
   
  -
   /*
  - * Initialize the worker
  + * Set worker properties.
    */
   static int JK_METHOD
   jk2_worker_ajp13_setAttribute(jk_env_t *env, jk_bean_t *mbean,
  @@ -168,6 +173,9 @@
       }
       else if (strcmp(name, "max_connections") == 0) {
           ajp13->maxEndpoints = atoi(value);
  +    }
  +     else if (strcmp(name, "debug") == 0) {
  +        mbean->debug = atoi(value);
       }
       else {
           return JK_ERR;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]