X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service%2Finstance.c;h=c22e546b945ee9e636ff6b6bf918a601694dcd31;hp=fa3594b710e0d453f8c6443f0e0557e060c5cf20;hb=6a6fa0a6067cb3c522f5dc735e808a68f62b30b2;hpb=0467aebb79f64d1c9d05a84367fda7c02c4ea6b8

diff --git a/service/instance.c b/service/instance.c
index fa3594b..c22e546 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -39,6 +39,7 @@ enum {
 	INSTANCE_ATTR_NICE,
 	INSTANCE_ATTR_LIMITS,
 	INSTANCE_ATTR_WATCH,
+	INSTANCE_ATTR_ERROR,
 	__INSTANCE_ATTR_MAX
 };
 
@@ -53,6 +54,7 @@ static const struct blobmsg_policy instance_attr[__INSTANCE_ATTR_MAX] = {
 	[INSTANCE_ATTR_NICE] = { "nice", BLOBMSG_TYPE_INT32 },
 	[INSTANCE_ATTR_LIMITS] = { "limits", BLOBMSG_TYPE_TABLE },
 	[INSTANCE_ATTR_WATCH] = { "watch", BLOBMSG_TYPE_ARRAY },
+	[INSTANCE_ATTR_ERROR] = { "error", BLOBMSG_TYPE_ARRAY },
 };
 
 struct instance_netdev {
@@ -165,6 +167,11 @@ instance_start(struct service_instance *in)
 {
 	int pid;
 
+	if (!avl_is_empty(&in->errors.avl)) {
+		LOG("Not starting instance %s::%s, an error was indicated\n", in->srv->name, in->name);
+		return;
+	}
+
 	if (in->proc.pending)
 		return;
 
@@ -188,6 +195,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
@@ -236,6 +244,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
@@ -285,6 +294,9 @@ instance_config_changed(struct service_instance *in, struct service_instance *in
 	if (!blobmsg_list_equal(&in->limits, &in_new->limits))
 		return true;
 
+	if (!blobmsg_list_equal(&in->errors, &in_new->errors))
+		return true;
+
 	return false;
 }
 
@@ -347,6 +359,15 @@ instance_file_update(struct blobmsg_list_node *l)
 	close(fd);
 }
 
+static void
+instance_fill_any(struct blobmsg_list *l, struct blob_attr *cur)
+{
+	if (!cur)
+		return;
+
+	blobmsg_list_fill(l, blobmsg_data(cur), blobmsg_data_len(cur), false);
+}
+
 static bool
 instance_fill_array(struct blobmsg_list *l, struct blob_attr *cur, blobmsg_update_cb cb, bool array)
 {
@@ -410,9 +431,7 @@ instance_config_parse(struct service_instance *in)
 		in->respawn_retry = vals[2];
 	}
 	if (tb[INSTANCE_ATTR_TRIGGER]) {
-		in->trigger = blob_memdup(tb[INSTANCE_ATTR_TRIGGER]);
-		if (!in->trigger)
-			return -1;
+		in->trigger = tb[INSTANCE_ATTR_TRIGGER];
 		trigger_add(in->trigger, in);
 	}
 
@@ -431,10 +450,9 @@ instance_config_parse(struct service_instance *in)
 			return false;
 	}
 
-	if (!instance_fill_array(&in->env, tb[INSTANCE_ATTR_ENV], NULL, false))
-		return false;
+	instance_fill_any(&in->data, tb[INSTANCE_ATTR_DATA]);
 
-	if (!instance_fill_array(&in->data, tb[INSTANCE_ATTR_DATA], NULL, false))
+	if (!instance_fill_array(&in->env, tb[INSTANCE_ATTR_ENV], NULL, false))
 		return false;
 
 	if (!instance_fill_array(&in->netdev, tb[INSTANCE_ATTR_NETDEV], instance_netdev_update, true))
@@ -446,6 +464,9 @@ instance_config_parse(struct service_instance *in)
 	if (!instance_fill_array(&in->limits, tb[INSTANCE_ATTR_LIMITS], NULL, false))
 		return false;
 
+	if (!instance_fill_array(&in->errors, tb[INSTANCE_ATTR_ERROR], NULL, true))
+		return false;
+
 	return true;
 }
 
@@ -457,6 +478,7 @@ instance_config_cleanup(struct service_instance *in)
 	blobmsg_list_free(&in->netdev);
 	blobmsg_list_free(&in->file);
 	blobmsg_list_free(&in->limits);
+	blobmsg_list_free(&in->errors);
 }
 
 static void
@@ -468,6 +490,7 @@ instance_config_move(struct service_instance *in, struct service_instance *in_sr
 	blobmsg_list_move(&in->netdev, &in_src->netdev);
 	blobmsg_list_move(&in->file, &in_src->file);
 	blobmsg_list_move(&in->limits, &in_src->limits);
+	blobmsg_list_move(&in->errors, &in_src->errors);
 	in->trigger = in_src->trigger;
 	in->command = in_src->command;
 	in->name = in_src->name;
@@ -506,7 +529,6 @@ instance_free(struct service_instance *in)
 	uloop_timeout_cancel(&in->timeout);
 	trigger_del(in);
 	watch_del(in);
-	free(in->trigger);
 	instance_config_cleanup(in);
 	free(in->config);
 	free(in);
@@ -527,6 +549,7 @@ instance_init(struct service_instance *in, struct service *s, struct blob_attr *
 	blobmsg_list_simple_init(&in->env);
 	blobmsg_list_simple_init(&in->data);
 	blobmsg_list_simple_init(&in->limits);
+	blobmsg_list_simple_init(&in->errors);
 	in->valid = instance_config_parse(in);
 }
 
@@ -540,6 +563,14 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
 		blobmsg_add_u32(b, "pid", in->proc.pid);
 	blobmsg_add_blob(b, in->command);
 
+	if (!avl_is_empty(&in->errors.avl)) {
+		struct blobmsg_list_node *var;
+		void *e = blobmsg_open_array(b, "errors");
+		blobmsg_list_for_each(&in->errors, var)
+			blobmsg_add_string(b, NULL, blobmsg_data(var->data));
+		blobmsg_close_table(b, e);
+	}
+
 	if (!avl_is_empty(&in->env.avl)) {
 		struct blobmsg_list_node *var;
 		void *e = blobmsg_open_table(b, "env");
@@ -548,6 +579,14 @@ void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
 		blobmsg_close_table(b, e);
 	}
 
+	if (!avl_is_empty(&in->data.avl)) {
+		struct blobmsg_list_node *var;
+		void *e = blobmsg_open_table(b, "data");
+		blobmsg_list_for_each(&in->data, var)
+			blobmsg_add_blob(b, var->data);
+		blobmsg_close_table(b, e);
+	}
+
 	if (!avl_is_empty(&in->limits.avl)) {
 		struct blobmsg_list_node *var;
 		void *e = blobmsg_open_table(b, "limits");