svn commit: r1387607 - in /httpd/httpd/trunk: docs/log-message-tags/next-number modules/proxy/proxy_util.c

[ji...@apache.org]

Author: jim
Date: Wed Sep 19 14:18:19 2012
New Revision: 1387607

URL: http://svn.apache.org/viewvc?rev=1387607&view=rev
Log:
Log whether or not the restore from shm actually
resulted in a match of shm data, or whether it
was stale.

Modified:
    httpd/httpd/trunk/docs/log-message-tags/next-number
    httpd/httpd/trunk/modules/proxy/proxy_util.c

Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1387607&r1=1387606&r2=1387607&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Wed Sep 19 14:18:19 2012
@@ -1 +1 @@
-2337
+2339

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1387607&r1=1387606&r2=1387607&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Wed Sep 19 14:18:19 2012
@@ -1199,6 +1199,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_sha
 {
     apr_status_t rv = APR_SUCCESS;
     proxy_balancer_method *lbmethod;
+    char *ptr = "";
     if (!shm || !balancer->s)
         return APR_EINVAL;
 
@@ -1207,7 +1208,11 @@ PROXY_DECLARE(apr_status_t) ap_proxy_sha
         memcpy(shm, balancer->s, sizeof(proxy_balancer_shared));
         if (balancer->s->was_malloced)
             free(balancer->s);
+    } else {
+        ptr = "not ";
     }
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02337)
+                 "%scopying shm for %s", ptr, balancer->s->name);
     balancer->s = shm;
     balancer->s->index = i;
     /* the below should always succeed */
@@ -1641,6 +1646,7 @@ PROXY_DECLARE(char *) ap_proxy_define_wo
 PROXY_DECLARE(apr_status_t) ap_proxy_share_worker(proxy_worker *worker, proxy_worker_shared *shm,
                                                   int i)
 {
+    char *ptr = "";
     if (!shm || !worker->s)
         return APR_EINVAL;
 
@@ -1649,7 +1655,11 @@ PROXY_DECLARE(apr_status_t) ap_proxy_sha
         memcpy(shm, worker->s, sizeof(proxy_worker_shared));
         if (worker->s->was_malloced)
             free(worker->s); /* was malloced in ap_proxy_define_worker */
+    } else {
+        ptr = "not ";
     }
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02338)
+                 "%scopying shm for worker: %s", ptr, worker->s->name);
 
     worker->s = shm;
     worker->s->index = i;