r3000 - trunk/varnish-cache/bin/varnishtest
phk at projects.linpro.no
phk at projects.linpro.no
Wed Jul 23 17:34:40 CEST 2008
Author: phk
Date: 2008-07-23 17:34:40 +0200 (Wed, 23 Jul 2008)
New Revision: 3000
Modified:
trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
Log:
We should not open the shm file until we have a cli connection, it
might not be there yet.
Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c 2008-07-23 15:30:02 UTC (rev 2999)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c 2008-07-23 15:34:40 UTC (rev 3000)
@@ -221,8 +221,6 @@
vsb_delete(vsb);
AZ(pthread_create(&v->tp, NULL, varnish_thread, v));
- v->stats = VSL_OpenStats(v->name);
-
vtc_log(v->vl, 3, "opening CLI connection");
for (i = 0; i < 10; i++) {
(void)usleep(200000);
@@ -237,6 +235,8 @@
}
vtc_log(v->vl, 3, "CLI connection fd = %d", v->cli_fd);
assert(v->cli_fd >= 0);
+ v->stats = VSL_OpenStats(v->name);
+
}
/**********************************************************************
More information about the varnish-commit
mailing list