service: make instance_update() void and unconditionally replace config on update

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

diff --git a/service/instance.c b/service/instance.c
index d7d1f82..bfc0979 100644 (file)
--- a/service/instance.c
+++ b/service/instance.c
@@ -386,7 +386,7 @@ instance_start(struct service_instance *in)
                return;
        }
 
-       if (in->proc.pending)
+       if (in->proc.pending || !in->command)
                return;
 
        instance_free_stdio(in);
@@ -526,7 +526,9 @@ 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);
                }
        }
@@ -541,7 +543,6 @@ instance_stop(struct service_instance *in)
        in->halt = true;
        in->restart = in->respawn = false;
        kill(in->proc.pid, SIGTERM);
-       instance_removepid(in);
 }
 
 static void
@@ -752,31 +753,42 @@ 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_RESPAWN]) {
                int i = 0;
@@ -907,25 +919,21 @@ 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;
 
-       if (!changed && running)
-               return false;
-
        if (!running) {
-               if (changed)
-                       instance_config_move(in, in_new);
+               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
@@ -980,7 +988,8 @@ 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);
 
        if (!avl_is_empty(&in->errors.avl)) {
                struct blobmsg_list_node *var;