From a3814e4cd234074f9bb1fcc00d4b4dd75b583d79 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Tue, 26 Jul 2016 17:37:18 +0000 Subject: [PATCH] mod_proxy_connect,wstunnel: log polling errors (and events) consistently at level ERR (resp. TRACE2), and name the backend connection "backend" instead of "sock". git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1754161 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy_connect.c | 25 ++++++++++--------------- modules/proxy/mod_proxy_wstunnel.c | 22 +++++++++++----------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/modules/proxy/mod_proxy_connect.c b/modules/proxy/mod_proxy_connect.c index 1dd277237d..7aaab2cae1 100644 --- a/modules/proxy/mod_proxy_connect.c +++ b/modules/proxy/mod_proxy_connect.c @@ -381,10 +381,9 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker, 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_rec *r, proxy_worker *worker, 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_rec *r, proxy_worker *worker, 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_rec *r, proxy_worker *worker, != 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; } diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c index 9adad20c80..1c0a01b47f 100644 --- a/modules/proxy/mod_proxy_wstunnel.c +++ b/modules/proxy/mod_proxy_wstunnel.c @@ -76,7 +76,7 @@ static int proxy_wstunnel_pump(ws_baton_t *baton, apr_time_t timeout, int try_po } } - 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_t *baton, apr_time_t timeout, int try_po 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_t *baton, apr_time_t timeout, int try_po 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_t *baton, apr_time_t timeout, int try_po != 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; }