summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-08-06 16:19:35 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-08-06 16:19:35 +0000
commit09c6ff334e1110bf2ef3ec6015a33ee676e9e713 (patch)
treec3da93b06aa8212a42806601b8ff7ce6fe12c62d
parent980a0d60a10bc6bf74575ee9917ff68eef789548 (diff)
downloadnginx-09c6ff334e1110bf2ef3ec6015a33ee676e9e713.tar.gz
nginx-09c6ff334e1110bf2ef3ec6015a33ee676e9e713.tar.bz2
Merge of r4757: debugging messages in limit_conn.
Fixed debugging messages to account that limit_zone was renamed to limit_conn.
-rw-r--r--src/http/modules/ngx_http_limit_conn_module.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_limit_conn_module.c b/src/http/modules/ngx_http_limit_conn_module.c
index c23c046ed..106da7a53 100644
--- 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_request_t *r)
}
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--;