From ba206e147c5fd9932b04ac24d01662d86ba7d6b9 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 8 Dec 2008 14:18:06 +0000 Subject: [PATCH] *) add zone name while logging 503 error reason *) log allocation error as 503 error reason --- src/http/modules/ngx_http_limit_req_module.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/http/modules/ngx_http_limit_req_module.c b/src/http/modules/ngx_http_limit_req_module.c index 16fe6221e..dac62ed15 100644 --- a/src/http/modules/ngx_http_limit_req_module.c +++ b/src/http/modules/ngx_http_limit_req_module.c @@ -178,8 +178,8 @@ ngx_http_limit_req_handler(ngx_http_request_t *r) ngx_shmtx_unlock(&ctx->shpool->mutex); ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, - "limiting requests, excess: %ui.%03ui", - excess / 1000, excess % 1000); + "limiting requests, excess: %ui.%03ui by zone \"%V\"", + excess / 1000, excess % 1000, &lrcf->shm_zone->name); return NGX_HTTP_SERVICE_UNAVAILABLE; } @@ -192,8 +192,8 @@ ngx_http_limit_req_handler(ngx_http_request_t *r) } ngx_log_error(NGX_LOG_WARN, r->connection->log, 0, - "delaying request, excess: %ui.%03ui", - excess / 1000, excess % 1000); + "delaying request, excess: %ui.%03ui, by zone \"%V\"", + excess / 1000, excess % 1000, &lrcf->shm_zone->name); if (ngx_handle_read_event(r->connection->read, 0) != NGX_OK) { return NGX_HTTP_INTERNAL_SERVER_ERROR; @@ -224,6 +224,11 @@ ngx_http_limit_req_handler(ngx_http_request_t *r) node = ngx_slab_alloc_locked(ctx->shpool, n); if (node == NULL) { ngx_shmtx_unlock(&ctx->shpool->mutex); + + ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0, + "could not allocate memory in zone \"%V\"", + &lrcf->shm_zone->name); + return NGX_HTTP_SERVICE_UNAVAILABLE; } }