instance: properly compare and reload respawn config

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

diff --git a/service/instance.c b/service/instance.c
index 1760a09..b7cb523 100644 (file)
--- a/service/instance.c
+++ b/service/instance.c
@@ -303,16 +303,13 @@ instance_run(struct service_instance *in, int _stdout, int _stderr)
        if (seccomp)
                setenv("SECCOMP_FILE", in->seccomp, 1);
 
-       if ((seccomp || setlbf) && asprintf(&ld_preload, "LD_PRELOAD=%s%s%s",
-                       seccomp ? "/lib/libpreload-seccomp.so" : "",
-                       seccomp && setlbf ? ":" : "",
-                       setlbf ? "/lib/libsetlbf.so" : "") > 0)
+       if (setlbf && asprintf(&ld_preload, "LD_PRELOAD=/lib/libsetlbf.so") > 0)
                putenv(ld_preload);
 
        blobmsg_list_for_each(&in->limits, var)
                instance_limits(blobmsg_name(var->data), blobmsg_data(var->data));
 
-       if (in->trace)
+       if (in->trace || seccomp)
                argc += 1;
 
        argv = alloca(sizeof(char *) * (argc + in->jail.argc));
@@ -320,6 +317,8 @@ instance_run(struct service_instance *in, int _stdout, int _stderr)
 
        if (in->trace)
                argv[argc++] = trace;
+       else if (seccomp)
+               argv[argc++] = "/sbin/seccomp-trace";
 
        if (in->has_jail)
                argc = jail_run(in, argv);
@@ -627,6 +626,13 @@ instance_config_changed(struct service_instance *in, struct service_instance *in
        if (!in->pidfile && in_new->pidfile)
                return true;
 
+       if (in->respawn_retry != in_new->respawn_retry)
+               return true;
+       if (in->respawn_threshold != in_new->respawn_threshold)
+               return true;
+       if (in->respawn_timeout != in_new->respawn_timeout)
+               return true;
+
        if (!blobmsg_list_equal(&in->limits, &in_new->limits))
                return true;
 
@@ -940,6 +946,9 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr
        in->trigger = in_src->trigger;
        in->command = in_src->command;
        in->pidfile = in_src->pidfile;
+       in->respawn_retry = in_src->respawn_retry;
+       in->respawn_threshold = in_src->respawn_threshold;
+       in->respawn_timeout = in_src->respawn_timeout;
        in->name = in_src->name;
        in->trace = in_src->trace;
        in->node.avl.key = in_src->node.avl.key;