Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/http
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2007-09-23 23:23:30 +0400
committerIgor Sysoev <igor@sysoev.ru>2007-09-23 23:23:30 +0400
commit1ec29e5d815d553915d59ffa467eb3ce3ae7c4f5 (patch)
treeafda9c5119a0aac24ff2a11e0e9bdc7adcdd7d33 /src/http
parentce0596d2ceefbba681534b29d5a415a6b914a9a7 (diff)
r1470 merge:
connection error should be logged with "connecting to upstream" action, the bug was introduced in r1154
Diffstat (limited to 'src/http')
-rw-r--r--src/http/ngx_http_upstream.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 7986f0fdf..919dc5903 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1288,6 +1288,7 @@ ngx_http_upstream_test_connect(ngx_connection_t *c)
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_connection_t *c)
}
if (err) {
+ c->log->action = "connecting to upstream";
(void) ngx_connection_error(c, err, "connect() failed");
return NGX_ERROR;
}