Mercurial > hg > nginx

changeset 1528:4699bab788c0 stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r1470 merge: connection error should be logged with "connecting to upstream" action, the bug was introduced in r1154
author Igor Sysoev <igor@sysoev.ru>
date Sun, 23 Sep 2007 19:23:30 +0000
parents 95e76183ec4f
children 93176ec9a9fc
files src/http/ngx_http_upstream.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1288,6 +1288,7 @@ ngx_http_upstream_test_connect(ngx_conne
 
     if (ngx_event_flags & NGX_USE_KQUEUE_EVENT)  {
         if (c->write->pending_eof) {
+            c->log->action = "connecting to upstream";
             (void) ngx_connection_error(c, c->write->kq_errno,
                                     "kevent() reported that connect() failed");
             return NGX_ERROR;
@@ -1311,6 +1312,7 @@ ngx_http_upstream_test_connect(ngx_conne
         }
 
         if (err) {
+            c->log->action = "connecting to upstream";
             (void) ngx_connection_error(c, err, "connect() failed");
             return NGX_ERROR;
         }