changeset 4795:ad072e83f2a9 stable-1.2

Merge of r4757: debugging messages in limit_conn. Fixed debugging messages to account that limit_zone was renamed to limit_conn.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 06 Aug 2012 16:19:35 +0000
parents 93119eae378a
children 0327b63390be
files src/http/modules/ngx_http_limit_conn_module.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_limit_conn_module.c
+++ b/src/http/modules/ngx_http_limit_conn_module.c
@@ -238,7 +238,7 @@ ngx_http_limit_conn_handler(ngx_http_req
         }
 
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                       "limit zone: %08XD %d", node->key, lc->conn);
+                       "limit conn: %08XD %d", node->key, lc->conn);
 
         ngx_shmtx_unlock(&shpool->mutex);
 
@@ -358,7 +358,7 @@ ngx_http_limit_conn_cleanup(void *data)
     ngx_shmtx_lock(&shpool->mutex);
 
     ngx_log_debug2(NGX_LOG_DEBUG_HTTP, lccln->shm_zone->shm.log, 0,
-                   "limit zone cleanup: %08XD %d", node->key, lc->conn);
+                   "limit conn cleanup: %08XD %d", node->key, lc->conn);
 
     lc->conn--;