syslog() is a blocking call on eglibc. as procd provides the actual syslog, weneed...

[project/procd.git] / instance.c

diff --git a/instance.c b/instance.c
index e6fc331..7895a04 100644 (file)
--- a/instance.c
+++ b/instance.c
@@ -334,15 +334,15 @@ instance_config_parse(struct service_instance *in)
                }
                in->respawn = true;
                in->respawn_count = 0;
-               in->respawn_timeout = vals[0];
-               in->respawn_threshold = vals[1];
+               in->respawn_threshold = vals[0];
+               in->respawn_timeout = vals[1];
                in->respawn_retry = vals[2];
        }
        if (tb[INSTANCE_ATTR_TRIGGER]) {
-               in->trigger = malloc(blob_len(tb[INSTANCE_ATTR_TRIGGER]));
+               in->trigger = malloc(blob_pad_len(tb[INSTANCE_ATTR_TRIGGER]));
                if (!in->trigger)
                        return -1;
-               memcpy(in->trigger, tb[INSTANCE_ATTR_TRIGGER], blob_len(tb[INSTANCE_ATTR_TRIGGER]));
+               memcpy(in->trigger, tb[INSTANCE_ATTR_TRIGGER], blob_pad_len(tb[INSTANCE_ATTR_TRIGGER]));
                trigger_add(in->trigger, in);
        }