rename ngx_http_file_cache_manager_sleep() to ngx_http_file_cache_loader_sleep()

and do not use it all in cache manager: this is a vestige of the times when
cache manager loaded cache
This commit is contained in:
Igor Sysoev 2011-07-25 09:45:00 +00:00
parent d8ce166e2e
commit 1850ce09a1

View File

@ -31,7 +31,7 @@ static time_t ngx_http_file_cache_expire(ngx_http_file_cache_t *cache);
static void ngx_http_file_cache_delete(ngx_http_file_cache_t *cache,
ngx_queue_t *q, u_char *name);
static ngx_int_t
ngx_http_file_cache_manager_sleep(ngx_http_file_cache_t *cache);
ngx_http_file_cache_loader_sleep(ngx_http_file_cache_t *cache);
static ngx_int_t ngx_http_file_cache_noop(ngx_tree_ctx_t *ctx,
ngx_str_t *path);
static ngx_int_t ngx_http_file_cache_manage_file(ngx_tree_ctx_t *ctx,
@ -1207,7 +1207,7 @@ ngx_http_file_cache_manager(void *data)
return wait;
}
if (ngx_http_file_cache_manager_sleep(cache) != NGX_OK) {
if (ngx_quit || ngx_terminate) {
return next;
}
}
@ -1261,7 +1261,7 @@ ngx_http_file_cache_loader(void *data)
static ngx_int_t
ngx_http_file_cache_manager_sleep(ngx_http_file_cache_t *cache)
ngx_http_file_cache_loader_sleep(ngx_http_file_cache_t *cache)
{
ngx_msec_t elapsed;
@ -1313,7 +1313,7 @@ ngx_http_file_cache_manage_file(ngx_tree_ctx_t *ctx, ngx_str_t *path)
(void) ngx_http_file_cache_delete_file(ctx, path);
}
return ngx_http_file_cache_manager_sleep(cache);
return ngx_http_file_cache_loader_sleep(cache);
}