procd: Replace strerror(errno) with %m.

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

diff --git a/service/instance.c b/service/instance.c
index e5c4830..25735ab 100644 (file)
--- a/service/instance.c
+++ b/service/instance.c
@@ -141,8 +141,6 @@ static const struct rlimit_name rlimit_names[] = {
        { NULL, 0 }
 };
 
-static char trace[] = "/sbin/utrace";
-
 static void closefd(int fd)
 {
        if (fd > STDERR_FILENO)
@@ -243,8 +241,8 @@ instance_removepid(struct service_instance *in) {
        if (!in->pidfile)
                return 0;
        if (unlink(in->pidfile)) {
-               ERROR("Failed to removed pidfile: %s: %d - %s\n",
-                       in->pidfile, errno, strerror(errno));
+               ERROR("Failed to removed pidfile: %s: %d - %m\n",
+                       in->pidfile, errno);
                return 1;
        }
        return 0;
@@ -260,19 +258,19 @@ instance_writepid(struct service_instance *in)
        }
        _pidfile = fopen(in->pidfile, "w");
        if (_pidfile == NULL) {
-               ERROR("failed to open pidfile for writing: %s: %d (%s)",
-                       in->pidfile, errno, strerror(errno));
+               ERROR("failed to open pidfile for writing: %s: %d (%m)",
+                       in->pidfile, errno);
                return 1;
        }
        if (fprintf(_pidfile, "%d\n", in->proc.pid) < 0) {
-               ERROR("failed to write pidfile: %s: %d (%s)",
-                       in->pidfile, errno, strerror(errno));
+               ERROR("failed to write pidfile: %s: %d (%m)",
+                       in->pidfile, errno);
                fclose(_pidfile);
                return 2;
        }
        if (fclose(_pidfile)) {
-               ERROR("failed to close pidfile: %s: %d (%s)",
-                       in->pidfile, errno, strerror(errno));
+               ERROR("failed to close pidfile: %s: %d (%m)",
+                       in->pidfile, errno);
                return 3;
        }
 
@@ -303,23 +301,27 @@ 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));
        argc = 0;
 
+#ifdef SECCOMP_SUPPORT
        if (in->trace)
-               argv[argc++] = trace;
+               argv[argc++] = "/sbin/utrace";
+       else if (seccomp)
+               argv[argc++] = "/sbin/seccomp-trace";
+#else
+       if (in->trace || seccomp)
+               ULOG_WARN("Seccomp support for %s::%s not available\n", in->srv->name, in->name);
+#endif
 
        if (in->has_jail)
                argc = jail_run(in, argv);
@@ -351,11 +353,11 @@ instance_run(struct service_instance *in, int _stdout, int _stderr)
        }
 
        if (in->gid && setgid(in->gid)) {
-               ERROR("failed to set group id %d: %d (%s)\n", in->gid, errno, strerror(errno));
+               ERROR("failed to set group id %d: %d (%m)\n", in->gid, errno);
                exit(127);
        }
        if (in->uid && setuid(in->uid)) {
-               ERROR("failed to set user id %d: %d (%s)\n", in->uid, errno, strerror(errno));
+               ERROR("failed to set user id %d: %d (%m)\n", in->uid, errno);
                exit(127);
        }
 
@@ -405,14 +407,14 @@ instance_start(struct service_instance *in)
        instance_free_stdio(in);
        if (in->_stdout.fd.fd > -2) {
                if (pipe(opipe)) {
-                       ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
+                       ULOG_WARN("pipe() failed: %d (%m)\n", errno);
                        opipe[0] = opipe[1] = -1;
                }
        }
 
        if (in->_stderr.fd.fd > -2) {
                if (pipe(epipe)) {
-                       ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
+                       ULOG_WARN("pipe() failed: %d (%m)\n", errno);
                        epipe[0] = epipe[1] = -1;
                }
        }
@@ -444,11 +446,13 @@ instance_start(struct service_instance *in)
        if (opipe[0] > -1) {
                ustream_fd_init(&in->_stdout, opipe[0]);
                closefd(opipe[1]);
+               fcntl(opipe[0], F_SETFD, FD_CLOEXEC);
        }
 
        if (epipe[0] > -1) {
                ustream_fd_init(&in->_stderr, epipe[0]);
                closefd(epipe[1]);
+               fcntl(epipe[0], F_SETFD, FD_CLOEXEC);
        }
 
        service_event("instance.start", in->srv->name, in->name);
@@ -625,6 +629,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;
 
@@ -871,15 +882,8 @@ instance_config_parse(struct service_instance *in)
        if (tb[INSTANCE_ATTR_NO_NEW_PRIVS])
                in->no_new_privs = blobmsg_get_bool(tb[INSTANCE_ATTR_NO_NEW_PRIVS]);
 
-       if (!in->trace && tb[INSTANCE_ATTR_SECCOMP]) {
-               char *seccomp = blobmsg_get_string(tb[INSTANCE_ATTR_SECCOMP]);
-               struct stat s;
-
-               if (stat(seccomp, &s))
-                       ERROR("%s: not starting seccomp as %s is missing\n", in->name, seccomp);
-               else
-                       in->seccomp = seccomp;
-       }
+       if (!in->trace && tb[INSTANCE_ATTR_SECCOMP])
+               in->seccomp = blobmsg_get_string(tb[INSTANCE_ATTR_SECCOMP]);
 
        if (tb[INSTANCE_ATTR_PIDFILE]) {
                char *pidfile = blobmsg_get_string(tb[INSTANCE_ATTR_PIDFILE]);
@@ -945,7 +949,11 @@ 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;
 
        free(in->config);