Author: rjung Date: Sun Nov 26 01:04:47 2006 New Revision: 479314 URL: http://svn.apache.org/viewvc?view=rev&rev=479314 Log: - Adding a new constant, used later in the status worker. - Adding two new useful debug messages. - removed trailing white space.
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?view=diff&rev=479314&r1=479313&r2=479314 ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original) +++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Sun Nov 26 01:04:47 2006 @@ -172,6 +172,10 @@ /* Syncing config values from shm */ void jk_lb_pull(lb_worker_t * p, jk_logger_t *l) { JK_TRACE_ENTER(l); + if (JK_IS_DEBUG_LEVEL(l)) + jk_log(l, JK_LOG_DEBUG, + "syncing mem for lb '%s' from shm", + p->s->name); p->sticky_session = p->s->sticky_session; p->sticky_session_force = p->s->sticky_session_force; p->recover_wait_time = p->s->recover_wait_time; @@ -185,6 +189,10 @@ /* Syncing config values from shm */ void jk_lb_push(lb_worker_t * p, jk_logger_t *l) { JK_TRACE_ENTER(l); + if (JK_IS_DEBUG_LEVEL(l)) + jk_log(l, JK_LOG_DEBUG, + "syncing shm for lb '%s' from mem", + p->s->name); p->s->sticky_session = p->sticky_session; p->s->sticky_session_force = p->sticky_session_force; p->s->recover_wait_time = p->recover_wait_time; @@ -441,7 +449,7 @@ JK_LB_DECAY_MULT * delta / lb->maintain_time); curmax = decay_load(lb, JK_LB_DECAY_MULT * delta / lb->maintain_time, l); if (!recover_workers(lb, curmax, now, l)) { - force_recovery(lb, l); + force_recovery(lb, l); } } @@ -1018,7 +1026,7 @@ else { /* No workers in error state. * Somebody set them all to disabled? - */ + */ jk_log(l, JK_LOG_ERROR, "All tomcat instances failed, no more workers left for recovery"); *is_error = JK_HTTP_SERVER_BUSY; @@ -1176,7 +1184,7 @@ p->lb_workers[i].s->lb_value = 0; p->lb_workers[i].s->state = JK_LB_STATE_NA; p->lb_workers[i].s->error_time = 0; - p->lb_workers[i].s->activation = + p->lb_workers[i].s->activation = jk_get_worker_activation(props, worker_names[i]); if (!wc_create_worker(p->lb_workers[i].s->name, 0, props, @@ -1206,7 +1214,7 @@ if (id_domain) { *id_domain = '\0'; strcpy(p->lb_workers[i].s->domain, p->lb_workers[i].s->jvm_route); - *id_domain = '.'; + *id_domain = '.'; } } if (JK_IS_DEBUG_LEVEL(l)) { Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h?view=diff&rev=479314&r1=479313&r2=479314 ============================================================================== --- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h (original) +++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h Sun Nov 26 01:04:47 2006 @@ -70,6 +70,7 @@ #define JK_LB_ACTIVATION_ACTIVE (1) #define JK_LB_ACTIVATION_DISABLED (2) #define JK_LB_ACTIVATION_STOPPED (3) +#define JK_LB_ACTIVATION_MAX (JK_LB_ACTIVATION_STOPPED) #define JK_LB_ACTIVATION_TEXT_ACTIVE ("ACT") #define JK_LB_ACTIVATION_TEXT_DISABLED ("DIS") #define JK_LB_ACTIVATION_TEXT_STOPPED ("STP") --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]