[nginx] svn commit: r4796 - in branches/stable-1.2: . src/http/modules

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-08-06 16:19:35 +0000 (Mon, 06 Aug 2012)
New Revision: 4796
URL: http://trac.nginx.org/nginx/changeset/4796/nginx

Log:
Merge of r4757: debugging messages in limit_conn.

Fixed debugging messages to account that limit_zone was renamed to limit_conn.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/modules/ngx_http_limit_conn_module.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-08-06 16:06:59 UTC (rev 4795)
+++ branches/stable-1.2	2012-08-06 16:19:35 UTC (rev 4796)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754,4756
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754,4756-4757
\ No newline at end of property
Modified: branches/stable-1.2/src/http/modules/ngx_http_limit_conn_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_limit_conn_module.c	2012-08-06 16:06:59 UTC (rev 4795)
+++ branches/stable-1.2/src/http/modules/ngx_http_limit_conn_module.c	2012-08-06 16:19:35 UTC (rev 4796)
@@ -238,7 +238,7 @@
         }
 
         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_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--;