Remove code that has become unnecessary after sysupgrade changes
[project/procd.git] / service / instance.c
index 8f7835a..e5c4830 100644 (file)
@@ -54,6 +54,8 @@ enum {
        INSTANCE_ATTR_TRACE,
        INSTANCE_ATTR_SECCOMP,
        INSTANCE_ATTR_PIDFILE,
+       INSTANCE_ATTR_RELOADSIG,
+       INSTANCE_ATTR_TERMTIMEOUT,
        __INSTANCE_ATTR_MAX
 };
 
@@ -77,6 +79,8 @@ static const struct blobmsg_policy instance_attr[__INSTANCE_ATTR_MAX] = {
        [INSTANCE_ATTR_TRACE] = { "trace", BLOBMSG_TYPE_BOOL },
        [INSTANCE_ATTR_SECCOMP] = { "seccomp", BLOBMSG_TYPE_STRING },
        [INSTANCE_ATTR_PIDFILE] = { "pidfile", BLOBMSG_TYPE_STRING },
+       [INSTANCE_ATTR_RELOADSIG] = { "reload_signal", BLOBMSG_TYPE_INT32 },
+       [INSTANCE_ATTR_TERMTIMEOUT] = { "term_timeout", BLOBMSG_TYPE_INT32 },
 };
 
 enum {
@@ -263,6 +267,7 @@ instance_writepid(struct service_instance *in)
        if (fprintf(_pidfile, "%d\n", in->proc.pid) < 0) {
                ERROR("failed to write pidfile: %s: %d (%s)",
                        in->pidfile, errno, strerror(errno));
+               fclose(_pidfile);
                return 2;
        }
        if (fclose(_pidfile)) {
@@ -386,8 +391,16 @@ instance_start(struct service_instance *in)
                return;
        }
 
-       if (in->proc.pending)
+       if (!in->command) {
+               LOG("Not starting instance %s::%s, command not set\n", in->srv->name, in->name);
                return;
+       }
+
+       if (in->proc.pending) {
+               if (in->halt)
+                       in->restart = true;
+               return;
+       }
 
        instance_free_stdio(in);
        if (in->_stdout.fd.fd > -2) {
@@ -405,7 +418,7 @@ instance_start(struct service_instance *in)
        }
 
        in->restart = false;
-       in->halt = !in->respawn;
+       in->halt = false;
 
        if (!in->valid)
                return;
@@ -491,7 +504,11 @@ instance_timeout(struct uloop_timeout *t)
 
        in = container_of(t, struct service_instance, timeout);
 
-       if (!in->halt && (in->restart || in->respawn))
+       if (in->halt) {
+               LOG("Instance %s::%s pid %d not stopped on SIGTERM, sending SIGKILL instead\n",
+                               in->srv->name, in->name, in->proc.pid);
+               kill(in->proc.pid, SIGKILL);
+       } else if (in->restart || in->respawn)
                instance_start(in);
 }
 
@@ -508,12 +525,21 @@ 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);
+
        if (in->halt) {
                instance_removepid(in);
+               if (in->restart)
+                       instance_start(in);
+               else {
+                       struct service *s = in->srv;
+
+                       avl_delete(&s->instances.avl, &in->node.avl);
+                       instance_free(in);
+                       service_stopped(s);
+               }
        } else if (in->restart) {
                instance_start(in);
        } else if (in->respawn) {
@@ -526,21 +552,23 @@ instance_exit(struct uloop_process *p, int ret)
                                                                in->srv->name, in->name, in->respawn_count, runtime);
                        in->restart = in->respawn = 0;
                        in->halt = 1;
+                       service_event("instance.fail", in->srv->name, in->name);
                } else {
+                       service_event("instance.respawn", in->srv->name, in->name);
                        uloop_timeout_set(&in->timeout, in->respawn_timeout * 1000);
                }
        }
-       service_event("instance.stop", in->srv->name, in->name);
 }
 
 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);
 }
 
 static void
@@ -548,10 +576,16 @@ instance_restart(struct service_instance *in)
 {
        if (!in->proc.pending)
                return;
-       in->halt = false;
+
+       if (in->reload_signal) {
+               kill(in->proc.pid, in->reload_signal);
+               return;
+       }
+
+       in->halt = true;
        in->restart = true;
        kill(in->proc.pid, SIGTERM);
-       instance_removepid(in);
+       uloop_timeout_set(&in->timeout, in->term_timeout * 1000);
 }
 
 static bool
@@ -566,9 +600,6 @@ instance_config_changed(struct service_instance *in, struct service_instance *in
        if (!blobmsg_list_equal(&in->env, &in_new->env))
                return true;
 
-       if (!blobmsg_list_equal(&in->data, &in_new->data))
-               return true;
-
        if (!blobmsg_list_equal(&in->netdev, &in_new->netdev))
                return true;
 
@@ -751,32 +782,45 @@ instance_jail_parse(struct service_instance *in, struct blob_attr *attr)
 }
 
 static bool
-instance_config_parse(struct service_instance *in)
+instance_config_parse_command(struct service_instance *in, struct blob_attr **tb)
 {
-       struct blob_attr *tb[__INSTANCE_ATTR_MAX];
        struct blob_attr *cur, *cur2;
-       int argc = 0;
+       bool ret = false;
        int rem;
 
-       blobmsg_parse(instance_attr, __INSTANCE_ATTR_MAX, tb,
-               blobmsg_data(in->config), blobmsg_data_len(in->config));
-
        cur = tb[INSTANCE_ATTR_COMMAND];
-       if (!cur)
-               return false;
+       if (!cur) {
+               in->command = NULL;
+               return true;
+       }
 
        if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING))
                return false;
 
        blobmsg_for_each_attr(cur2, cur, rem) {
-               argc++;
+               ret = true;
                break;
        }
-       if (!argc)
-               return false;
 
        in->command = cur;
+       return ret;
+}
+
+static bool
+instance_config_parse(struct service_instance *in)
+{
+       struct blob_attr *tb[__INSTANCE_ATTR_MAX];
+       struct blob_attr *cur, *cur2;
+       int rem;
 
+       blobmsg_parse(instance_attr, __INSTANCE_ATTR_MAX, tb,
+               blobmsg_data(in->config), blobmsg_data_len(in->config));
+
+       if (!instance_config_parse_command(in, tb))
+               return false;
+
+       if (tb[INSTANCE_ATTR_TERMTIMEOUT])
+               in->term_timeout = blobmsg_get_u32(tb[INSTANCE_ATTR_TERMTIMEOUT]);
        if (tb[INSTANCE_ATTR_RESPAWN]) {
                int i = 0;
                uint32_t vals[3] = { 3600, 5, 5};
@@ -843,6 +887,9 @@ instance_config_parse(struct service_instance *in)
                        in->pidfile = pidfile;
        }
 
+       if (tb[INSTANCE_ATTR_RELOADSIG])
+               in->reload_signal = blobmsg_get_u32(tb[INSTANCE_ATTR_RELOADSIG]);
+
        if (!in->trace && tb[INSTANCE_ATTR_JAIL])
                in->has_jail = instance_jail_parse(in, tb[INSTANCE_ATTR_JAIL]);
 
@@ -906,25 +953,22 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr
        in_src->config = NULL;
 }
 
-bool
+void
 instance_update(struct service_instance *in, struct service_instance *in_new)
 {
        bool changed = instance_config_changed(in, in_new);
        bool running = in->proc.pending;
+       bool stopping = in->halt;
 
-       if (!changed && running)
-               return false;
-
-       if (!running) {
-               if (changed)
-                       instance_config_move(in, in_new);
+       if (!running || stopping) {
+               instance_config_move(in, in_new);
                instance_start(in);
        } else {
-               instance_restart(in);
+               if (changed)
+                       instance_restart(in);
                instance_config_move(in, in_new);
                /* restart happens in the child callback handler */
        }
-       return true;
 }
 
 void
@@ -949,6 +993,7 @@ instance_init(struct service_instance *in, struct service *s, struct blob_attr *
        in->config = config;
        in->timeout.cb = instance_timeout;
        in->proc.cb = instance_exit;
+       in->term_timeout = 5;
 
        in->_stdout.fd.fd = -2;
        in->_stdout.stream.string_data = true;
@@ -979,7 +1024,9 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
        blobmsg_add_u8(b, "running", in->proc.pending);
        if (in->proc.pending)
                blobmsg_add_u32(b, "pid", in->proc.pid);
-       blobmsg_add_blob(b, in->command);
+       if (in->command)
+               blobmsg_add_blob(b, in->command);
+       blobmsg_add_u32(b, "term_timeout", in->term_timeout);
 
        if (!avl_is_empty(&in->errors.avl)) {
                struct blobmsg_list_node *var;
@@ -1013,6 +1060,9 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
                blobmsg_close_table(b, e);
        }
 
+       if (in->reload_signal)
+               blobmsg_add_u32(b, "reload_signal", in->reload_signal);
+
        if (in->respawn) {
                void *r = blobmsg_open_table(b, "respawn");
                blobmsg_add_u32(b, "threshold", in->respawn_threshold);