httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1754161 - in /httpd/httpd/trunk/modules/proxy: mod_proxy_connect.c mod_proxy_wstunnel.c
Date Tue, 26 Jul 2016 17:37:18 GMT
Author: ylavic
Date: Tue Jul 26 17:37:18 2016
New Revision: 1754161

URL: http://svn.apache.org/viewvc?rev=1754161&view=rev
Log:
mod_proxy_connect,wstunnel: log polling errors (and events) consistently at
level ERR (resp. TRACE2), and name the backend connection "backend" instead of
"sock".

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c?rev=1754161&r1=1754160&r2=1754161&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c Tue Jul 26 17:37:18 2016
@@ -381,10 +381,9 @@ static int proxy_connect_handler(request
             ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01023) "error apr_poll()");
             return HTTP_INTERNAL_SERVER_ERROR;
         }
-#ifdef DEBUGGING
-        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01024)
+
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, APLOGNO(01024)
                       "woke from poll(), i=%d", pollcnt);
-#endif
 
         for (pi = 0; pi < pollcnt; pi++) {
             const apr_pollfd_t *cur = &signalled[pi];
@@ -392,20 +391,18 @@ static int proxy_connect_handler(request
             if (cur->desc.s == sock) {
                 pollevent = cur->rtnevents;
                 if (pollevent & (APR_POLLIN | APR_POLLHUP)) {
-#ifdef DEBUGGING
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01025)
-                                  "sock was readable");
-#endif
+                    ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, APLOGNO(01025)
+                                  "backend was readable");
                     done |= ap_proxy_transfer_between_connections(r, backconn,
                                                                   c, bb_back,
                                                                   bb_front,
-                                                                  "sock", NULL,
+                                                                  "backend", NULL,
                                                                   CONN_BLKSZ, 1)
                                                                  != APR_SUCCESS;
                 }
                 else if (pollevent & APR_POLLERR) {
-                    ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(01026)
-                                  "err on backconn");
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01026)
+                                  "err on backend connection");
                     backconn->aborted = 1;
                     done = 1;
                 }
@@ -413,10 +410,8 @@ static int proxy_connect_handler(request
             else if (cur->desc.s == client_socket) {
                 pollevent = cur->rtnevents;
                 if (pollevent & (APR_POLLIN | APR_POLLHUP)) {
-#ifdef DEBUGGING
-                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01027)
+                    ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, APLOGNO(01027)
                                   "client was readable");
-#endif
                     done |= ap_proxy_transfer_between_connections(r, c,
                                                                   backconn,
                                                                   bb_front,
@@ -427,8 +422,8 @@ static int proxy_connect_handler(request
                                                                  != APR_SUCCESS;
                 }
                 else if (pollevent & APR_POLLERR) {
-                    ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02827)
-                                  "err on client");
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02827)
+                                  "err on client connection");
                     c->aborted = 1;
                     done = 1;
                 }

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c?rev=1754161&r1=1754160&r2=1754161&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Tue Jul 26 17:37:18 2016
@@ -76,7 +76,7 @@ static int proxy_wstunnel_pump(ws_baton_
             }
         }
 
-        ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(02445)
+        ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, APLOGNO(02445)
                 "woke from poll(), i=%d", pollcnt);
 
         for (pi = 0; pi < pollcnt; pi++) {
@@ -85,23 +85,23 @@ static int proxy_wstunnel_pump(ws_baton_
             if (cur->desc.s == sock) {
                 pollevent = cur->rtnevents;
                 if (pollevent & (APR_POLLIN | APR_POLLHUP)) {
-                    ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(02446)
-                            "sock was readable");
+                    ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, APLOGNO(02446)
+                            "backend was readable");
                     done |= ap_proxy_transfer_between_connections(r, backconn,
                                                                   c, bb_i, bb_o,
-                                                                  "sock", NULL,
+                                                                  "backend", NULL,
                                                                   AP_IOBUFSIZE,
                                                                   0)
                                                                  != APR_SUCCESS;
                 }
                 else if (pollevent & APR_POLLERR) {
-                    ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02447)
-                            "error on backconn");
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02447)
+                            "error on backend connection");
                     backconn->aborted = 1;
                     done = 1;
                 }
                 else { 
-                    ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02605)
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02605)
                             "unknown event on backconn %d", pollevent);
                     done = 1;
                 }
@@ -109,7 +109,7 @@ static int proxy_wstunnel_pump(ws_baton_
             else if (cur->desc.s == client_socket) {
                 pollevent = cur->rtnevents;
                 if (pollevent & (APR_POLLIN | APR_POLLHUP)) {
-                    ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(02448)
+                    ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, APLOGNO(02448)
                             "client was readable");
                     done |= ap_proxy_transfer_between_connections(r, c, backconn,
                                                                   bb_o, bb_i,
@@ -120,13 +120,13 @@ static int proxy_wstunnel_pump(ws_baton_
                                                                  != APR_SUCCESS;
                 }
                 else if (pollevent & APR_POLLERR) {
-                    ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, APLOGNO(02607)
-                            "error on client conn");
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02607)
+                            "error on client connection");
                     c->aborted = 1;
                     done = 1;
                 }
                 else { 
-                    ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02606)
+                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02606)
                             "unknown event on client conn %d", pollevent);
                     done = 1;
                 }



Mime
View raw message