From fa524e9063212bf021aa557a0e42b2b0c06f3982 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Sat, 6 Jun 2009 17:48:54 +0000 Subject: [PATCH] delete useless r->cache->uses --- src/http/ngx_http_cache.h | 1 - src/http/ngx_http_file_cache.c | 8 ++------ src/http/ngx_http_upstream.c | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/http/ngx_http_cache.h b/src/http/ngx_http_cache.h index 697c4d49b..ed5ec2499 100644 --- a/src/http/ngx_http_cache.h +++ b/src/http/ngx_http_cache.h @@ -62,7 +62,6 @@ struct ngx_http_cache_s { off_t length; ngx_uint_t min_uses; - ngx_uint_t uses; ngx_uint_t error; ngx_uint_t valid_msec; diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c index 0893c15d0..8c944aed3 100644 --- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -172,9 +172,8 @@ ngx_http_file_cache_open(ngx_http_request_t *r) rc = ngx_http_file_cache_exists(cache, c); - ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http file cache exists: %i u:%ui e:%d", - rc, c->uses, c->exists); + ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http file cache exists: %i e:%d", rc, c->exists); if (rc == NGX_ERROR) { return rc; @@ -332,8 +331,6 @@ ngx_http_file_cache_open(ngx_http_request_t *r) if (c->valid_sec < now) { - c->uses = c->min_uses; - ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http file cache expired: %T %T", c->valid_sec, now); @@ -440,7 +437,6 @@ done: ngx_queue_insert_head(&cache->sh->queue, &fcn->queue); c->uniq = fcn->uniq; - c->uses = fcn->uses; c->error = fcn->error; c->node = fcn; diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 1d9ccb8b0..f360e841e 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -577,8 +577,8 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u) rc = ngx_http_file_cache_open(r); - ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http upstream cache: %i u:%ui", rc, c->uses); + ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http upstream cache: %i", rc); if (rc == NGX_OK) {