You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2003/03/04 08:22:10 UTC
cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
costin 2003/03/03 23:22:10
Modified: jk/native2/common jk_worker_ajp13.c
Log:
Added setters and init for the new field
Revision Changes Path
1.45 +9 -7 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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- jk_worker_ajp13.c 1 Mar 2003 05:49:58 -0000 1.44
+++ jk_worker_ajp13.c 4 Mar 2003 07:22:10 -0000 1.45
@@ -83,12 +83,12 @@
/* -------------------- Impl -------------------- */
static char *jk2_worker_ajp13_getAttributeInfo[]={ "lb_factor", "lb_value", "debug", "channel", "level",
- "route", "errorState", "graceful", "groups",
+ "route", "errorState", "graceful", "groups", "disabled",
"epCount", "errorTime", NULL };
static char *jk2_worker_ajp13_multiValueInfo[]={"group", NULL };
-static char *jk2_worker_ajp13_setAttributeInfo[]={"debug", "channel", "route", "secretkey", "group", "graceful",
+static char *jk2_worker_ajp13_setAttributeInfo[]={"debug", "channel", "route", "secretkey", "group", "graceful", "disabled",
"lb_factor", "level", NULL };
@@ -118,7 +118,9 @@
} else if (strcmp( name, "errorState" )==0 ) {
return jk2_env_itoa( env, worker->in_error_state );
} else if (strcmp( name, "graceful" )==0 ) {
- return jk2_env_itoa( env, worker->mbean->disabled );
+ return jk2_env_itoa( env, worker->graceful );
+ } else if (strcmp( name, "disabled" )==0 ) {
+ return jk2_env_itoa( env, bean->disabled );
} else if (strcmp( name, "epCount" )==0 ) {
if( worker->endpointCache==NULL ) return "0";
return jk2_env_itoa( env, worker->endpointCache->count );
@@ -145,10 +147,9 @@
} else if( strcmp( name, "route" )==0 ) {
ajp13->route=value;
} else if( strcmp( name, "graceful" )==0 ) {
- if( strcmp( value, "0") )
- ajp13->mbean->disabled=0;
- else
- ajp13->mbean->disabled=1;
+ ajp13->graceful=atoi( value );
+ } else if( strcmp( name, "disabled" )==0 ) {
+ mbean->disabled=atoi( value );
} else if( strcmp( name, "group" )==0 ) {
ajp13->groups->add( env, ajp13->groups, value, ajp13 );
} else if( strcmp( name, "lb_factor" )==0 ) {
@@ -871,6 +872,7 @@
w->secret= NULL;
w->lb_factor=1;
+ w->graceful=0;
w->service = jk2_worker_ajp13_service;
result->setAttribute= jk2_worker_ajp13_setAttribute;
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org