Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 1528:4699bab788c0 stable-0.5
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 | 9b10ba85b249 |
comparison
equal
deleted
inserted
replaced
1527:95e76183ec4f | 1528:4699bab788c0 |
---|---|
1286 | 1286 |
1287 #if (NGX_HAVE_KQUEUE) | 1287 #if (NGX_HAVE_KQUEUE) |
1288 | 1288 |
1289 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { | 1289 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { |
1290 if (c->write->pending_eof) { | 1290 if (c->write->pending_eof) { |
1291 c->log->action = "connecting to upstream"; | |
1291 (void) ngx_connection_error(c, c->write->kq_errno, | 1292 (void) ngx_connection_error(c, c->write->kq_errno, |
1292 "kevent() reported that connect() failed"); | 1293 "kevent() reported that connect() failed"); |
1293 return NGX_ERROR; | 1294 return NGX_ERROR; |
1294 } | 1295 } |
1295 | 1296 |
1309 { | 1310 { |
1310 err = ngx_errno; | 1311 err = ngx_errno; |
1311 } | 1312 } |
1312 | 1313 |
1313 if (err) { | 1314 if (err) { |
1315 c->log->action = "connecting to upstream"; | |
1314 (void) ngx_connection_error(c, err, "connect() failed"); | 1316 (void) ngx_connection_error(c, err, "connect() failed"); |
1315 return NGX_ERROR; | 1317 return NGX_ERROR; |
1316 } | 1318 } |
1317 } | 1319 } |
1318 | 1320 |