You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2010/08/24 20:04:06 UTC

svn commit: r988635 - /httpd/httpd/trunk/modules/proxy/proxy_util.c

Author: trawick
Date: Tue Aug 24 18:04:06 2010
New Revision: 988635

URL: http://svn.apache.org/viewvc?rev=988635&view=rev
Log:
ap_proxy_retry_worker() only needs to spit out one debug
message, and it should indicate whether or not retry will
be attempted

Modified:
    httpd/httpd/trunk/modules/proxy/proxy_util.c

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=988635&r1=988634&r2=988635&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Tue Aug 24 18:04:06 2010
@@ -2025,9 +2025,6 @@ PROXY_DECLARE(int) ap_proxy_retry_worker
                                          server_rec *s)
 {
     if (worker->s->status & PROXY_WORKER_IN_ERROR) {
-        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
-                    "proxy: %s: retrying the worker for (%s)",
-                     proxy_function, worker->hostname);
         if (apr_time_now() > worker->s->error_time + worker->retry) {
             ++worker->s->retries;
             worker->s->status &= ~PROXY_WORKER_IN_ERROR;
@@ -2037,6 +2034,9 @@ PROXY_DECLARE(int) ap_proxy_retry_worker
             return OK;
         }
         else {
+            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
+                         "proxy: %s: too soon to retry worker for (%s)",
+                         proxy_function, worker->hostname);
             return DECLINED;
         }
     }