service: register the subscriber object before the event handler

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

diff --git a/service/instance.c b/service/instance.c
index 27b81f5..e410bc4 100644 (file)
--- a/service/instance.c
+++ b/service/instance.c
@@ -38,6 +38,7 @@ enum {
        INSTANCE_ATTR_RESPAWN,
        INSTANCE_ATTR_NICE,
        INSTANCE_ATTR_LIMITS,
+       INSTANCE_ATTR_WATCH,
        __INSTANCE_ATTR_MAX
 };
 
@@ -51,6 +52,7 @@ static const struct blobmsg_policy instance_attr[__INSTANCE_ATTR_MAX] = {
        [INSTANCE_ATTR_RESPAWN] = { "respawn", BLOBMSG_TYPE_ARRAY },
        [INSTANCE_ATTR_NICE] = { "nice", BLOBMSG_TYPE_INT32 },
        [INSTANCE_ATTR_LIMITS] = { "limits", BLOBMSG_TYPE_TABLE },
+       [INSTANCE_ATTR_WATCH] = { "watch", BLOBMSG_TYPE_ARRAY },
 };
 
 struct instance_netdev {
@@ -91,6 +93,7 @@ instance_limits(const char *limit, const char *value)
 {
        int i;
        struct rlimit rlim;
+       unsigned long cur, max;
 
        for (i = 0; rlimit_names[i].name != NULL; i++) {
                if (strcmp(rlimit_names[i].name, limit))
@@ -98,10 +101,20 @@ instance_limits(const char *limit, const char *value)
                if (!strcmp(value, "unlimited")) {
                        rlim.rlim_cur = RLIM_INFINITY;
                        rlim.rlim_max = RLIM_INFINITY;
+               } else {
+                       if (getrlimit(rlimit_names[i].resource, &rlim))
+                               return;
+
+                       cur = rlim.rlim_cur;
+                       max = rlim.rlim_max;
+
+                       if (sscanf(value, "%lu %lu", &cur, &max) < 1)
+                               return;
+
+                       rlim.rlim_cur = cur;
+                       rlim.rlim_max = max;
                }
-               else if (getrlimit(rlimit_names[i].resource, &rlim) ||
-                        sscanf(value, "%lu %lu", &rlim.rlim_cur, &rlim.rlim_max) == 0)
-                       return;
+
                setrlimit(rlimit_names[i].resource, &rlim);
                return;
        }
@@ -175,6 +188,7 @@ instance_start(struct service_instance *in)
        in->proc.pid = pid;
        clock_gettime(CLOCK_MONOTONIC, &in->start);
        uloop_process_add(&in->proc);
+       service_event("instance.start", in->srv->name, in->name);
 }
 
 static void
@@ -223,6 +237,7 @@ instance_exit(struct uloop_process *p, int ret)
                        uloop_timeout_set(&in->timeout, in->respawn_timeout * 1000);
                }
        }
+       service_event("instance.stop", in->srv->name, in->name);
 }
 
 void
@@ -397,13 +412,21 @@ instance_config_parse(struct service_instance *in)
                in->respawn_retry = vals[2];
        }
        if (tb[INSTANCE_ATTR_TRIGGER]) {
-               in->trigger = malloc(blob_pad_len(tb[INSTANCE_ATTR_TRIGGER]));
+               in->trigger = blob_memdup(tb[INSTANCE_ATTR_TRIGGER]);
                if (!in->trigger)
                        return -1;
-               memcpy(in->trigger, tb[INSTANCE_ATTR_TRIGGER], blob_pad_len(tb[INSTANCE_ATTR_TRIGGER]));
                trigger_add(in->trigger, in);
        }
 
+       if (tb[INSTANCE_ATTR_WATCH]) {
+               blobmsg_for_each_attr(cur2, tb[INSTANCE_ATTR_WATCH], rem) {
+                       if (blobmsg_type(cur2) != BLOBMSG_TYPE_STRING)
+                               continue;
+                       DEBUG(3, "watch for %s\n", blobmsg_get_string(cur2));
+                       watch_add(blobmsg_get_string(cur2), in);
+               }
+       }
+
        if ((cur = tb[INSTANCE_ATTR_NICE])) {
                in->nice = (int8_t) blobmsg_get_u32(cur);
                if (in->nice < -20 || in->nice > 20)
@@ -434,6 +457,7 @@ instance_config_cleanup(struct service_instance *in)
        blobmsg_list_free(&in->env);
        blobmsg_list_free(&in->data);
        blobmsg_list_free(&in->netdev);
+       blobmsg_list_free(&in->file);
        blobmsg_list_free(&in->limits);
 }
 
@@ -444,6 +468,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);
+       blobmsg_list_move(&in->file, &in_src->file);
        blobmsg_list_move(&in->limits, &in_src->limits);
        in->trigger = in_src->trigger;
        in->command = in_src->command;
@@ -482,6 +507,7 @@ instance_free(struct service_instance *in)
        uloop_process_delete(&in->proc);
        uloop_timeout_cancel(&in->timeout);
        trigger_del(in);
+       watch_del(in);
        free(in->trigger);
        instance_config_cleanup(in);
        free(in->config);