add trigger support

[project/procd.git] / instance.c

diff --git a/instance.c b/instance.c
index 2a648d7..b5ecad0 100644 (file)
--- a/instance.c
+++ b/instance.c
@@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -17,6 +31,7 @@ enum {
        INSTANCE_ATTR_DATA,
        INSTANCE_ATTR_NETDEV,
        INSTANCE_ATTR_FILE,
+       INSTANCE_ATTR_TRIGGER,
        INSTANCE_ATTR_NICE,
        __INSTANCE_ATTR_MAX
 };
@@ -27,6 +42,7 @@ static const struct blobmsg_policy instance_attr[__INSTANCE_ATTR_MAX] = {
        [INSTANCE_ATTR_DATA] = { "data", BLOBMSG_TYPE_TABLE },
        [INSTANCE_ATTR_NETDEV] = { "netdev", BLOBMSG_TYPE_ARRAY },
        [INSTANCE_ATTR_FILE] = { "file", BLOBMSG_TYPE_ARRAY },
+       [INSTANCE_ATTR_TRIGGER] = { "triggers", BLOBMSG_TYPE_ARRAY },
        [INSTANCE_ATTR_NICE] = { "nice", BLOBMSG_TYPE_INT32 },
 };
 
@@ -90,7 +106,7 @@ instance_start(struct service_instance *in)
                return;
        }
 
-       LOG("Started instance %s::%s\n", in->srv->name, in->name);
+       DEBUG(1, "Started instance %s::%s\n", in->srv->name, in->name);
        in->proc.pid = pid;
        uloop_process_add(&in->proc);
 }
@@ -112,7 +128,7 @@ instance_exit(struct uloop_process *p, int ret)
        struct service_instance *in;
 
        in = container_of(p, struct service_instance, proc);
-       LOG("Instance %s::%s exit with error code %d\n", in->srv->name, in->name, ret);
+       DEBUG(1, "Instance %s::%s exit with error code %d\n", in->srv->name, in->name, ret);
        uloop_timeout_cancel(&in->timeout);
        if (in->restart)
                instance_start(in);
@@ -258,7 +274,11 @@ instance_config_parse(struct service_instance *in)
                return false;
 
        in->command = cur;
+       in->trigger = tb[INSTANCE_ATTR_TRIGGER];
 
+       if (in->trigger) {
+               trigger_add(in->trigger, in);
+       }
        if ((cur = tb[INSTANCE_ATTR_NICE])) {
                in->nice = (int8_t) blobmsg_get_u32(cur);
                if (in->nice < -20 || in->nice > 20)
@@ -295,6 +315,7 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr
        blobmsg_list_move(&in->env, &in_src->env);
        blobmsg_list_move(&in->data, &in_src->data);
        blobmsg_list_move(&in->netdev, &in_src->netdev);
+       in->trigger = in_src->trigger;
        in->command = in_src->command;
        in->name = in_src->name;
        in->node.avl.key = in_src->node.avl.key;
@@ -308,13 +329,20 @@ bool
 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)
+       if (!changed && running)
                return false;
 
-       in->restart = true;
-       instance_stop(in, true);
-       instance_config_move(in, in_new);
+       if (!running) {
+               if (changed)
+                       instance_config_move(in, in_new);
+               instance_start(in);
+       } else {
+               in->restart = true;
+               instance_stop(in, true);
+               instance_config_move(in, in_new);
+       }
        return true;
 }
 
@@ -323,6 +351,7 @@ instance_free(struct service_instance *in)
 {
        uloop_process_delete(&in->proc);
        uloop_timeout_cancel(&in->timeout);
+       trigger_del(in);
        instance_config_cleanup(in);
        free(in->config);
        free(in);
@@ -345,7 +374,7 @@ instance_init(struct service_instance *in, struct service *s, struct blob_attr *
        in->valid = instance_config_parse(in);
 }
 
-void instance_dump(struct blob_buf *b, struct service_instance *in)
+void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
 {
        void *i;
 
@@ -354,5 +383,7 @@ void instance_dump(struct blob_buf *b, struct service_instance *in)
        if (in->proc.pending)
                blobmsg_add_u32(b, "pid", in->proc.pid);
        blobmsg_add_blob(b, in->command);
+       if (verbose && in->trigger)
+               blobmsg_add_blob(b, in->trigger);
        blobmsg_close_table(b, i);
 }