IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-20 06:03:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upstream: use_temp_path parameter of proxy_cache_path and friends.

Browse Source 
When set to "off", temporary files for cacheable responses will be stored
inside cache directory.
This commit is contained in:
Valentin Bartenev 2014-12-26 16:22:59 +03:00
parent 1858857c25
commit 843fb552ec
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/http/ngx_http_cache.h
View File

@ -155,6 +155,9 @@ struct ngx_http_file_cache_s {
ngx_msec_t loader_threshold;
ngx_shm_zone_t *shm_zone;
ngx_uint_t use_temp_path;
/* unsigned use_temp_path:1 */
};

36
src/http/ngx_http_file_cache.c
View File

@ -1935,6 +1935,17 @@ ngx_http_file_cache_add_file(ngx_tree_ctx_t *ctx, ngx_str_t *name)
return NGX_ERROR;
}
/*
* Temporary files in cache have a suffix consisting of a dot
* followed by 10 digits.
*/
if (name->len >= 2 * NGX_HTTP_CACHE_KEY_LEN + 1 + 10
&& name->data[name->len - 10 - 1] == '.')
{
return NGX_OK;
}
if (ctx->size < (off_t) sizeof(ngx_http_file_cache_header_t)) {
ngx_log_error(NGX_LOG_CRIT, ctx->log, 0,
"cache file \"%s\" is too small", name->data);
@ -2063,7 +2074,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_str_t s, name, *value;
ngx_int_t loader_files;
ngx_msec_t loader_sleep, loader_threshold;
ngx_uint_t i, n;
ngx_uint_t i, n, use_temp_path;
ngx_array_t *caches;
ngx_http_file_cache_t *cache, **ce;
@ -2077,6 +2088,8 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR;
}
use_temp_path = 1;
inactive = 600;
loader_files = 100;
loader_sleep = 50;
@ -2137,6 +2150,25 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_ERROR;
}
if (ngx_strncmp(value[i].data, "use_temp_path=", 14) == 0) {
if (ngx_strcmp(&value[i].data[14], "on") == 0) {
use_temp_path = 1;
} else if (ngx_strcmp(&value[i].data[14], "off") == 0) {
use_temp_path = 0;
} else {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid use_temp_path value \"%V\", "
"it must be \"on\" or \"off\"",
&value[i]);
return NGX_CONF_ERROR;
}
continue;
}
if (ngx_strncmp(value[i].data, "keys_zone=", 10) == 0) {
name.data = value[i].data + 10;
@ -2274,6 +2306,8 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
cache->shm_zone->init = ngx_http_file_cache_init;
cache->shm_zone->data = cache;
cache->use_temp_path = use_temp_path;
cache->inactive = inactive;
cache->max_size = max_size;

8
src/http/ngx_http_upstream.c
View File

@ -2677,6 +2677,14 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
if (p->cacheable) {
p->temp_file->persistent = 1;
#if (NGX_HTTP_CACHE)
if (r->cache && !r->cache->file_cache->use_temp_path) {
p->temp_file->file.name = r->cache->file.name;
p->temp_file->path = r->cache->file_cache->path;
p->temp_file->prefix = 1;
}
#endif
} else {
p->temp_file->log_level = NGX_LOG_WARN;
p->temp_file->warn = "an upstream response is buffered "