X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service.c;h=29acc57eef7ff20760864c4a06d07a3a000642cd;hp=b5f4f3ed091745deefdb9eedd2657aaf4af8dea6;hb=8183146ad8c706c33465fbef926f5d6e971da625;hpb=d8695bda1728d205fd76a4a5f8b329de418928dc

diff --git a/service.c b/service.c
index b5f4f3e..29acc57 100644
--- a/service.c
+++ b/service.c
@@ -12,10 +12,12 @@
  * GNU General Public License for more details.
  */
 
+#include <libubox/blobmsg_json.h>
 #include <libubox/avl-cmp.h>
 #include "procd.h"
 #include "service.h"
 #include "instance.h"
+#include "rcS.h"
 
 struct avl_tree services;
 static struct blob_buf b;
@@ -54,7 +56,7 @@ service_instance_update(struct vlist_tree *tree, struct vlist_node *node_new,
 		instance_free(in_n);
 	} else if (in_o) {
 		DEBUG(1, "Free instance %s::%s\n", in_o->srv->name, in_o->name);
-		instance_stop(in_o, false);
+		instance_stop(in_o);
 		instance_free(in_o);
 	} else if (in_n) {
 		DEBUG(1, "Create instance %s::%s\n", in_n->srv->name, in_n->name);
@@ -100,7 +102,19 @@ service_update(struct service *s, struct blob_attr *config, struct blob_attr **t
 	struct blob_attr *cur;
 	int rem;
 
-	s->trigger = tb[SERVICE_SET_TRIGGER];
+	if (s->trigger) {
+		trigger_del(s);
+		free(s->trigger);
+		s->trigger = NULL;
+	}
+
+	if (tb[SERVICE_SET_TRIGGER] && blobmsg_data_len(tb[SERVICE_SET_TRIGGER])) {
+		s->trigger = malloc(blob_pad_len(tb[SERVICE_SET_TRIGGER]));
+		if (!s->trigger)
+			return -1;
+		memcpy(s->trigger, tb[SERVICE_SET_TRIGGER], blob_pad_len(tb[SERVICE_SET_TRIGGER]));
+		trigger_add(s->trigger, s);
+	}
 
 	if (tb[SERVICE_SET_INSTANCES]) {
 		if (!add)
@@ -112,6 +126,8 @@ service_update(struct service *s, struct blob_attr *config, struct blob_attr **t
 			vlist_flush(&s->instances);
 	}
 
+	rc(s->name, "running");
+
 	return 0;
 }
 
@@ -120,7 +136,9 @@ service_delete(struct service *s)
 {
 	vlist_flush_all(&s->instances);
 	avl_delete(&services, &s->avl);
-	free(s->config);
+	trigger_del(s);
+	s->trigger = NULL;
+	free(s->trigger);
 	free(s);
 }
 
@@ -150,7 +168,7 @@ enum {
 };
 
 static const struct blobmsg_policy service_list_attrs[__SERVICE_LIST_ATTR_MAX] = {
-	[SERVICE_LIST_ATTR_VERBOSE] = { "verbose", BLOBMSG_TYPE_INT32 },
+	[SERVICE_LIST_ATTR_VERBOSE] = { "verbose", BLOBMSG_TYPE_BOOL },
 };
 
 enum {
@@ -212,16 +230,19 @@ service_dump(struct service *s, int verbose)
 	struct service_instance *in;
 	void *c, *i;
 
-	if (avl_is_empty(&s->instances.avl))
+	c = blobmsg_open_table(&b, s->name);
+
+	if (avl_is_empty(&s->instances.avl)) {
+		blobmsg_close_table(&b, c);
 		return;
+	}
 
-	c = blobmsg_open_table(&b, s->name);
 	i = blobmsg_open_table(&b, "instances");
-	if (verbose && s->trigger)
-		blobmsg_add_blob(&b, s->trigger);
 	vlist_for_each_element(&s->instances, in, node)
 		instance_dump(&b, in, verbose);
 	blobmsg_close_table(&b, i);
+	if (verbose && s->trigger)
+		blobmsg_add_blob(&b, s->trigger);
 	blobmsg_close_table(&b, c);
 }
 
@@ -236,7 +257,7 @@ service_handle_list(struct ubus_context *ctx, struct ubus_object *obj,
 
 	blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
 
-	if (tb[SERVICE_LIST_ATTR_VERBOSE] && blobmsg_get_u32(tb[SERVICE_LIST_ATTR_VERBOSE]))
+	if (tb[SERVICE_LIST_ATTR_VERBOSE] && blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE]))
 		verbose = 1;
 
 	blob_buf_init(&b, 0);
@@ -329,33 +350,6 @@ service_handle_event(struct ubus_context *ctx, struct ubus_object *obj,
 	return 0;
 }
 
-enum {
-	TRIGGER_ATTR,
-	__TRIGGER_MAX
-};
-
-static const struct blobmsg_policy trigger_policy[__TRIGGER_MAX] = {
-	[TRIGGER_ATTR] = { .name = "triggers", .type = BLOBMSG_TYPE_ARRAY },
-};
-
-static int service_handle_trigger(struct ubus_context *ctx, struct ubus_object *obj,
-			struct ubus_request_data *req, const char *method,
-			struct blob_attr *msg)
-{
-	struct blob_attr *tb[__TRIGGER_MAX];
-
-	if (!msg)
-		return UBUS_STATUS_INVALID_ARGUMENT;
-
-	blobmsg_parse(trigger_policy, __TRIGGER_MAX, tb, blob_data(msg), blob_len(msg));
-	if (!tb[TRIGGER_ATTR])
-		return UBUS_STATUS_INVALID_ARGUMENT;
-
-	trigger_add(tb[TRIGGER_ATTR], NULL);
-
-	return 0;
-}
-
 static struct ubus_method main_object_methods[] = {
 	UBUS_METHOD("set", service_handle_set, service_set_attrs),
 	UBUS_METHOD("add", service_handle_set, service_set_attrs),
@@ -364,7 +358,6 @@ static struct ubus_method main_object_methods[] = {
 	UBUS_METHOD("update_start", service_handle_update, service_attrs),
 	UBUS_METHOD("update_complete", service_handle_update, service_attrs),
 	UBUS_METHOD("event", service_handle_event, event_policy),
-	UBUS_METHOD("trigger", service_handle_trigger, trigger_policy),
 };
 
 static struct ubus_object_type main_object_type =