X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=service.c;h=4189e2d4b8e79fc3bce29bc1db5396a2065bf906;hb=35f0336c12d77226f4856d3d04415fbfee93b233;hp=ffbc58463ce95c6f6fbe4c67c4f40020fd2a209d;hpb=5bf4764d977d35c2075fc183bd75ef5b28a03cb4;p=project%2Fprocd.git

diff --git a/service.c b/service.c
index ffbc584..4189e2d 100644
--- a/service.c
+++ b/service.c
@@ -12,6 +12,7 @@
  * GNU General Public License for more details.
  */
 
+#include <libubox/blobmsg_json.h>
 #include <libubox/avl-cmp.h>
 #include "procd.h"
 #include "service.h"
@@ -100,7 +101,13 @@ 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);
+
+	if (tb[SERVICE_SET_TRIGGER] && blobmsg_data_len(tb[SERVICE_SET_TRIGGER])) {
+		s->trigger = tb[SERVICE_SET_TRIGGER];
+		trigger_add(s->trigger, s);
+	}
 
 	if (tb[SERVICE_SET_INSTANCES]) {
 		if (!add)
@@ -120,6 +127,7 @@ service_delete(struct service *s)
 {
 	vlist_flush_all(&s->instances);
 	avl_delete(&services, &s->avl);
+	trigger_del(s);
 	free(s->config);
 	free(s);
 }
@@ -150,7 +158,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 {
@@ -216,9 +224,9 @@ service_dump(struct service *s, int verbose)
 		return;
 
 	c = blobmsg_open_table(&b, s->name);
-	i = blobmsg_open_table(&b, "instances");
 	if (verbose && s->trigger)
 		blobmsg_add_blob(&b, s->trigger);
+	i = blobmsg_open_table(&b, "instances");
 	vlist_for_each_element(&s->instances, in, node)
 		instance_dump(&b, in, verbose);
 	blobmsg_close_table(&b, i);
@@ -236,7 +244,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);
@@ -254,17 +262,14 @@ service_handle_delete(struct ubus_context *ctx, struct ubus_object *obj,
 		    struct blob_attr *msg)
 {
 	struct blob_attr *tb[__SERVICE_DEL_ATTR_MAX], *cur;
-	struct service *s, *tmp;
+	struct service *s;
 	struct service_instance *in;
 
 	blobmsg_parse(service_del_attrs, __SERVICE_DEL_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
 
 	cur = tb[SERVICE_DEL_ATTR_NAME];
-	if (!cur) {
-		avl_for_each_element_safe(&services, s, avl, tmp)
-			service_delete(s);
-		return 0;
-	}
+	if (!cur)
+		return UBUS_STATUS_NOT_FOUND;
 
 	s = avl_find_element(&services, blobmsg_data(cur), s, avl);
 	if (!s)
@@ -332,33 +337,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),
@@ -367,7 +345,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 =