Skip to content

V
varnishevent3
Commit 543e3dfe authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

More parameter tweaks based on VUG3 discussions: 

err_ttl:
	Pointless and wrongly documented.  Remove and set Retry-After:
	in default.vcl
expiry_sleep:
	Remove misleading advise.
send_timeout:
	Reduce to one minute, 10 minutes was far too long.
ban_lurker_sleep:
	Reduce sleep between successful evictions to 10msec to speed
	ban lurker up to max 100 objects/second.
parent 0956e008
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 11 deletions
bin/varnishd/cache_center.c
View file @ 543e3dfe
......@@ -399,7 +399,6 @@ cnt_error(struct sess *sp)
TIM_format(TIM_real(), date);
http_PrintfHeader(w, sp->fd, h, "Date: %s", date);
http_PrintfHeader(w, sp->fd, h, "Server: Varnish");
http_PrintfHeader(w, sp->fd, h, "Retry-After: %d", params->err_ttl);
if (sp->err_reason != NULL)
http_PutResponse(w, sp->fd, h, sp->err_reason);
......
bin/varnishd/default.vcl
View file @ 543e3dfe
......@@ -120,6 +120,7 @@ sub vcl_deliver {
sub vcl_error {
set obj.http.Content-Type = "text/html; charset=utf-8";
set obj.http.Retry-After = "5";
synthetic {"
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
......
bin/varnishd/heritage.h
View file @ 543e3dfe
......@@ -73,9 +73,6 @@ struct params {
/* TTL used for lack of anything better */
unsigned default_ttl;
/* TTL used for synthesized error pages */
unsigned err_ttl;
/* Maximum concurrent sessions */
unsigned max_sess;
......
bin/varnishd/mgt_param.c
View file @ 543e3dfe
......@@ -589,7 +589,7 @@ static const struct parspec input_parspec[] = {
"5", "seconds" },
{ "expiry_sleep", tweak_timeout_double, &master.expiry_sleep, 0, 60,
"How long the expiry thread sleeps when there is nothing "
"for it to do. Reduce if your expiry thread gets behind.\n",
"for it to do.\n",
0,
"1", "seconds" },
{ "pipe_timeout", tweak_timeout, &master.pipe_timeout, 0, 0,
......@@ -604,7 +604,7 @@ static const struct parspec input_parspec[] = {
"the session is closed.\n"
"See setsockopt(2) under SO_SNDTIMEO for more information.",
DELAYED_EFFECT,
"600", "seconds" },
"60", "seconds" },
{ "auto_restart", tweak_bool, &master.auto_restart, 0, 0,
"Restart child process automatically if it dies.\n",
0,
......@@ -816,10 +816,6 @@ static const struct parspec input_parspec[] = {
"Use 0x notation and do the bitor in your head :-)\n",
0,
"0", "bitmap" },
{ "err_ttl", tweak_uint, &master.err_ttl, 0, UINT_MAX,
"The TTL assigned to the synthesized error pages\n",
0,
"0", "seconds" },
{ "ban_dups", tweak_bool, &master.ban_dups, 0, 0,
"Detect and eliminate duplicate bans.\n",
0,
......@@ -835,7 +831,7 @@ static const struct parspec input_parspec[] = {
" list. It always sleeps a second when nothing can be done.\n"
"A value of zero disables the ban lurker.",
0,
"0.1", "s" },
"0.01", "s" },
{ "saintmode_threshold", tweak_uint,
&master.saintmode_threshold, 0, UINT_MAX,
"The maximum number of objects held off by saint mode before "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment