Commit 20749276 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Add a hack so we always get the VSL logged on varnish -wait

parent 38c4a7d6
...@@ -77,6 +77,8 @@ struct varnish { ...@@ -77,6 +77,8 @@ struct varnish {
struct VSM_data *vd; /* vsc use */ struct VSM_data *vd; /* vsc use */
unsigned vsl_tag_count[256]; unsigned vsl_tag_count[256];
volatile int vsl_idle;
}; };
#define NONSENSE "%XJEIFLH|)Xspa8P" #define NONSENSE "%XJEIFLH|)Xspa8P"
...@@ -223,8 +225,9 @@ varnishlog_thread(void *priv) ...@@ -223,8 +225,9 @@ varnishlog_thread(void *priv)
i = VSL_Next(c); i = VSL_Next(c);
if (i == 0) { if (i == 0) {
v->vsl_idle++;
/* Nothing to do but wait */ /* Nothing to do but wait */
VTIM_sleep(0.01); VTIM_sleep(0.1);
continue; continue;
} else if (i == -2) { } else if (i == -2) {
/* Abandoned - try reconnect */ /* Abandoned - try reconnect */
...@@ -235,6 +238,8 @@ varnishlog_thread(void *priv) ...@@ -235,6 +238,8 @@ varnishlog_thread(void *priv)
} else if (i != 1) } else if (i != 1)
break; break;
v->vsl_idle = 0;
tag = VSL_TAG(c->rec.ptr); tag = VSL_TAG(c->rec.ptr);
vxid = VSL_ID(c->rec.ptr); vxid = VSL_ID(c->rec.ptr);
if (tag == SLT__Batch) if (tag == SLT__Batch)
...@@ -595,9 +600,11 @@ varnish_wait(struct varnish *v) ...@@ -595,9 +600,11 @@ varnish_wait(struct varnish *v)
if (v->cli_fd < 0) if (v->cli_fd < 0)
return; return;
varnish_ask_cli(v, "backend.list", &resp);
while (v->vsl_idle < 10)
(void)usleep(200000);
if (vtc_error) if (vtc_error)
(void)sleep(1); /* give panic messages a chance */ (void)sleep(1); /* give panic messages a chance */
varnish_ask_cli(v, "backend.list", &resp);
varnish_stop(v); varnish_stop(v);
vtc_log(v->vl, 2, "Wait"); vtc_log(v->vl, 2, "Wait");
AZ(close(v->cli_fd)); AZ(close(v->cli_fd));
......
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