tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jean-frederic clere <jfrederic.cl...@fujitsu-siemens.com>
Subject Re: PATCH - \jk\native2\common\jk_worker_ajp13.c - get/set updates
Date Wed, 26 May 2004 08:14:01 GMT
NormW wrote:
> Greetings All,
> The link below is an updated diff to the above referenced file, and which
> does thefollowing:
> 
> - 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[] to a more logical sequence for status worker
> display:
>   : balance related items are grouped,
>   : route items are grouped,
>   : connections items are grouped,
>   : 'debug' and 'disabled' at the end of the list (to be in a standard
> location).

Committed thanks.

> 
> http://normw.gknw.com/patches/jk_worker_ajp13.c.diff2
> 
> The code presentation changes have generally be removed from this to ease
> analysis of changes...(the original diff remains available).
> 
> The resulting jk_worker_ajp13.c has been successfully compiled and tested to
> display correctly in status worker pages on a NetWare platform.
> Norm.
> -----------------------------------------
> --- jk_worker_ajp13.c.orig 2004-03-22 07:46:09.000000000 +1100
> +++ jk_worker_ajp13.c 2004-05-26 09:43:59.000000000 +1000
> @@ -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,
> @@ -169,6 +174,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: tomcat-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
> 
> 


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


Mime
View raw message