comparison src/http/ngx_http_upstream.c @ 1469:0a269c464eaf

connection error should be logged with "connecting to upstream" action, the bug was introduced in r1154
author Igor Sysoev <igor@sysoev.ru>
date Sun, 09 Sep 2007 18:43:16 +0000
parents 491e5059ea19
children 56f1ea5baabb
comparison
equal deleted inserted replaced
1468:491e5059ea19 1469:0a269c464eaf
1288 1288
1289 #if (NGX_HAVE_KQUEUE) 1289 #if (NGX_HAVE_KQUEUE)
1290 1290
1291 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { 1291 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
1292 if (c->write->pending_eof) { 1292 if (c->write->pending_eof) {
1293 c->log->action = "connecting to upstream";
1293 (void) ngx_connection_error(c, c->write->kq_errno, 1294 (void) ngx_connection_error(c, c->write->kq_errno,
1294 "kevent() reported that connect() failed"); 1295 "kevent() reported that connect() failed");
1295 return NGX_ERROR; 1296 return NGX_ERROR;
1296 } 1297 }
1297 1298
1311 { 1312 {
1312 err = ngx_errno; 1313 err = ngx_errno;
1313 } 1314 }
1314 1315
1315 if (err) { 1316 if (err) {
1317 c->log->action = "connecting to upstream";
1316 (void) ngx_connection_error(c, err, "connect() failed"); 1318 (void) ngx_connection_error(c, err, "connect() failed");
1317 return NGX_ERROR; 1319 return NGX_ERROR;
1318 } 1320 }
1319 } 1321 }
1320 1322