add a debug message for showing exit of instances

[project/procd.git] / instance.c

diff --git a/instance.c b/instance.c
index c788f9d..cc839d7 100644 (file)
--- a/instance.c
+++ b/instance.c
@@ -64,6 +64,7 @@ instance_start(struct service_instance *in)
                return;
        }
 
+       DPRINTF("Started instance %s::%s\n", in->srv->name, in->name);
        in->proc.pid = pid;
        uloop_process_add(&in->proc);
 }
@@ -85,6 +86,7 @@ instance_exit(struct uloop_process *p, int ret)
        struct service_instance *in;
 
        in = container_of(p, struct service_instance, proc);
+       DPRINTF("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);
@@ -173,6 +175,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);
        in->command = in_src->command;
+       in->name = in_src->name;
 }
 
 bool
@@ -200,8 +203,10 @@ instance_free(struct service_instance *in)
 }
 
 void
-instance_init(struct service_instance *in, struct blob_attr *config)
+instance_init(struct service_instance *in, struct service *s, struct blob_attr *config)
 {
+       in->srv = s;
+       in->name = blobmsg_name(config);
        in->config = config;
        in->timeout.cb = instance_timeout;
        in->proc.cb = instance_exit;
@@ -210,3 +215,15 @@ instance_init(struct service_instance *in, struct blob_attr *config)
        blobmsg_list_simple_init(&in->data);
        in->valid = instance_config_parse(in);
 }
+
+void instance_dump(struct blob_buf *b, struct service_instance *in)
+{
+       void *i;
+
+       i = blobmsg_open_table(b, in->name);
+       blobmsg_add_u8(b, "running", in->proc.pending);
+       if (in->proc.pending)
+               blobmsg_add_u32(b, "pid", in->proc.pid);
+       blobmsg_add_blob(b, in->command);
+       blobmsg_close_table(b, i);
+}