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

If we fail to start the child, set it to state stopping to prevent

auto_restart from looping over what is almost guaranteed to be a
problem it cannot solve.



git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@4123 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 374f0b19
...@@ -344,7 +344,6 @@ start_child(struct cli *cli) ...@@ -344,7 +344,6 @@ start_child(struct cli *cli)
e->callback = child_listener; e->callback = child_listener;
AZ(vev_add(mgt_evb, e)); AZ(vev_add(mgt_evb, e));
ev_listen = e; ev_listen = e;
AZ(ev_poker); AZ(ev_poker);
if (params->ping_interval > 0) { if (params->ping_interval > 0) {
e = vev_new(); e = vev_new();
...@@ -361,11 +360,10 @@ start_child(struct cli *cli) ...@@ -361,11 +360,10 @@ start_child(struct cli *cli)
if (mgt_push_vcls_and_start(&u, &p)) { if (mgt_push_vcls_and_start(&u, &p)) {
REPORT(LOG_ERR, "Pushing vcls failed: %s", p); REPORT(LOG_ERR, "Pushing vcls failed: %s", p);
free(p); free(p);
/* Pick up any stuff lingering on stdout/stderr */ child_state = CH_RUNNING;
(void)child_listener(NULL, EV_RD); mgt_stop_child();
exit(2); } else
} child_state = CH_RUNNING;
child_state = CH_RUNNING;
} }
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
......
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