Mercurial > hg > nginx
comparison src/http/modules/ngx_http_limit_conn_module.c @ 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 | 778ef9c3fd2d |
children | 21d1e3bcb356 |
comparison
equal
deleted
inserted
replaced
4793:93119eae378a | 4795:ad072e83f2a9 |
---|---|
236 | 236 |
237 lc->conn++; | 237 lc->conn++; |
238 } | 238 } |
239 | 239 |
240 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | 240 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
241 "limit zone: %08XD %d", node->key, lc->conn); | 241 "limit conn: %08XD %d", node->key, lc->conn); |
242 | 242 |
243 ngx_shmtx_unlock(&shpool->mutex); | 243 ngx_shmtx_unlock(&shpool->mutex); |
244 | 244 |
245 cln = ngx_pool_cleanup_add(r->pool, | 245 cln = ngx_pool_cleanup_add(r->pool, |
246 sizeof(ngx_http_limit_conn_cleanup_t)); | 246 sizeof(ngx_http_limit_conn_cleanup_t)); |
356 lc = (ngx_http_limit_conn_node_t *) &node->color; | 356 lc = (ngx_http_limit_conn_node_t *) &node->color; |
357 | 357 |
358 ngx_shmtx_lock(&shpool->mutex); | 358 ngx_shmtx_lock(&shpool->mutex); |
359 | 359 |
360 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, lccln->shm_zone->shm.log, 0, | 360 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, lccln->shm_zone->shm.log, 0, |
361 "limit zone cleanup: %08XD %d", node->key, lc->conn); | 361 "limit conn cleanup: %08XD %d", node->key, lc->conn); |
362 | 362 |
363 lc->conn--; | 363 lc->conn--; |
364 | 364 |
365 if (lc->conn == 0) { | 365 if (lc->conn == 0) { |
366 ngx_rbtree_delete(ctx->rbtree, node); | 366 ngx_rbtree_delete(ctx->rbtree, node); |