Author: rjung
Date: Sat May 13 07:07:00 2006
New Revision: 406109
URL: http://svn.apache.org/viewcvs?rev=406109&view=rev
Log:
Move lb_method_type to jk_lb_worker.h to make it
available for jk_status and jk_lb_worker.
Modified:
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
tomcat/connectors/trunk/jk/native/common/jk_status.c
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c?rev=406109&r1=406108&r2=406109&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.c Sat May 13 07:07:00
2006
@@ -628,8 +628,8 @@
}
if (rc && JK_IS_DEBUG_LEVEL(l)) {
jk_log(l, JK_LOG_DEBUG,
- "found best worker (%s) using %s method", rc->s->name,
- p->lbmethod == JK_LB_BYREQUESTS ? "by request" : "by traffic");
+ "found best worker (%s) using method '%s'",
+ rc->s->name, lb_method_type[p->lbmethod]);
}
JK_TRACE_EXIT(l);
return rc;
Modified: tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h?rev=406109&r1=406108&r2=406109&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_lb_worker.h Sat May 13 07:07:00
2006
@@ -50,6 +50,14 @@
#define WAIT_BEFORE_RECOVER (60)
+static const char *lb_method_type[] = {
+ JK_LB_METHOD_REQUESTS,
+ JK_LB_METHOD_TRAFFIC,
+ JK_LB_METHOD_BUSYNESS,
+ "unknown",
+ NULL
+};
+
struct worker_record
{
jk_worker_t *w;
Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=406109&r1=406108&r2=406109&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Sat May 13 07:07:00
2006
@@ -90,14 +90,6 @@
NULL
};
-static const char *lb_method_type[] = {
- JK_LB_METHOD_REQUESTS,
- JK_LB_METHOD_TRAFFIC,
- JK_LB_METHOD_BUSYNESS,
- "unknown",
- NULL
-};
-
#define HEADERS_NO_CACHE "no-cache", "no-cache", NULL
static const char *headers_vhtml[] = {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
