]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
I wondered why I never saw the scoreboard init entry; now I know.
authorJim Jagielski <jim@apache.org>
Tue, 14 Feb 2006 14:55:02 +0000 (14:55 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 14 Feb 2006 14:55:02 +0000 (14:55 +0000)
The logic flow was slightly askew.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@377738 13f79535-47bb-0310-9956-ffa450edef68

modules/proxy/proxy_util.c

index 1fa9b2f78431a05f5cd2fc962ea3e5d7e142861d..73dc5d2874158a5147916e81f1f0f84dab1f2bfe 100644 (file)
@@ -1580,23 +1580,27 @@ PROXY_DECLARE(void) ap_proxy_initialize_worker_share(proxy_server_conf *conf,
     void *score = NULL;
 #endif
 
-    if (worker->s && worker->s->status & PROXY_WORKER_INITIALIZED) {
+    if (worker->s && (worker->s->status & PROXY_WORKER_INITIALIZED)) {
         /* The worker share is already initialized */
+        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+              "proxy: worker %s already initialized",
+              worker->name);
         return;
     }
 #if PROXY_HAS_SCOREBOARD
         /* Get scoreboard slot */
     if (ap_scoreboard_image) {
         score = ap_get_scoreboard_lb(worker->id);
-    if (!score)
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
-              "proxy: ap_get_scoreboard_lb(%d) failed for worker %s",
-              worker->id, worker->name);
-    }
-    else {
-        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-              "proxy: initialized scoreboard slot %d for worker %s",
-              worker->id, worker->name);
+        if (!score) {
+            ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
+                  "proxy: ap_get_scoreboard_lb(%d) failed for worker %s",
+                  worker->id, worker->name);
+        }
+        else {
+             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                  "proxy: initialized scoreboard slot %d for worker %s",
+                  worker->id, worker->name);
+        }
     }
 #endif
     if (!score) {