[master] 8b4c13c Don't leave pid file in weird error case.
Poul-Henning Kamp
phk at varnish-cache.org
Wed Sep 7 22:16:49 CEST 2011
commit 8b4c13c4f3c4aa73d2466445459d4c950b6689d6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Sep 7 20:16:30 2011 +0000
Don't leave pid file in weird error case.
diff --git a/bin/varnishd/mgt_child.c b/bin/varnishd/mgt_child.c
index ebdf57b..9d6966a 100644
--- a/bin/varnishd/mgt_child.c
+++ b/bin/varnishd/mgt_child.c
@@ -595,8 +595,10 @@ MGT_Run(void)
REPORT0(LOG_ERR, "No VCL loaded yet");
else if (!d_flag) {
start_child(NULL);
- if (child_state == CH_STOPPED)
- exit(2);
+ if (child_state == CH_STOPPED) {
+ exit_status = 2;
+ return;
+ }
}
i = vev_schedule(mgt_evb);
More information about the varnish-commit
mailing list