Remove code that has become unnecessary after sysupgrade changes

[project/procd.git] / service / instance.c

diff --git a/service/instance.c b/service/instance.c
index 4d340fd..e5c4830 100644 (file)
--- a/service/instance.c
+++ b/service/instance.c
@@ -525,8 +525,6 @@ instance_exit(struct uloop_process *p, int ret)
        runtime = tp.tv_sec - in->start.tv_sec;
 
        DEBUG(2, "Instance %s::%s exit with error code %d after %ld seconds\n", in->srv->name, in->name, ret, runtime);
-       if (upgrade_running)
-               return;
 
        uloop_timeout_cancel(&in->timeout);
        service_event("instance.stop", in->srv->name, in->name);
@@ -563,11 +561,11 @@ instance_exit(struct uloop_process *p, int ret)
 }
 
 void
-instance_stop(struct service_instance *in)
+instance_stop(struct service_instance *in, bool halt)
 {
        if (!in->proc.pending)
                return;
-       in->halt = true;
+       in->halt = halt;
        in->restart = in->respawn = false;
        kill(in->proc.pid, SIGTERM);
        uloop_timeout_set(&in->timeout, in->term_timeout * 1000);