X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=service.c;h=29acc57eef7ff20760864c4a06d07a3a000642cd;hp=16593fc976705c86f399160219ea34a99c802cf9;hb=8183146ad8c706c33465fbef926f5d6e971da625;hpb=0f479be2068d7fe3bd5953e7454aaabb2be38d93 diff --git a/service.c b/service.c index 16593fc..29acc57 100644 --- a/service.c +++ b/service.c @@ -1,7 +1,23 @@ +/* + * Copyright (C) 2013 Felix Fietkau + * Copyright (C) 2013 John Crispin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include #include #include "procd.h" #include "service.h" #include "instance.h" +#include "rcS.h" struct avl_tree services; static struct blob_buf b; @@ -35,15 +51,15 @@ service_instance_update(struct vlist_tree *tree, struct vlist_node *node_new, in_n = container_of(node_new, struct service_instance, node); if (in_o && in_n) { - LOG("Update instance %s::%s\n", in_o->srv->name, in_o->name); + DEBUG(1, "Update instance %s::%s\n", in_o->srv->name, in_o->name); instance_update(in_o, in_n); instance_free(in_n); } else if (in_o) { - LOG("Free instance %s::%s\n", in_o->srv->name, in_o->name); - instance_stop(in_o, false); + DEBUG(1, "Free instance %s::%s\n", in_o->srv->name, in_o->name); + instance_stop(in_o); instance_free(in_o); } else if (in_n) { - LOG("Create instance %s::%s\n", in_n->srv->name, in_n->name); + DEBUG(1, "Create instance %s::%s\n", in_n->srv->name, in_n->name); instance_start(in_n); } } @@ -69,6 +85,7 @@ enum { SERVICE_SET_NAME, SERVICE_SET_SCRIPT, SERVICE_SET_INSTANCES, + SERVICE_SET_TRIGGER, __SERVICE_SET_MAX }; @@ -76,15 +93,29 @@ static const struct blobmsg_policy service_set_attrs[__SERVICE_SET_MAX] = { [SERVICE_SET_NAME] = { "name", BLOBMSG_TYPE_STRING }, [SERVICE_SET_SCRIPT] = { "script", BLOBMSG_TYPE_STRING }, [SERVICE_SET_INSTANCES] = { "instances", BLOBMSG_TYPE_TABLE }, + [SERVICE_SET_TRIGGER] = { "triggers", BLOBMSG_TYPE_ARRAY }, }; - static int service_update(struct service *s, struct blob_attr *config, struct blob_attr **tb, bool add) { struct blob_attr *cur; int rem; + 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) vlist_update(&s->instances); @@ -95,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; } @@ -103,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); } @@ -127,6 +162,25 @@ static const struct blobmsg_policy service_del_attrs[__SERVICE_DEL_ATTR_MAX] = { [SERVICE_DEL_ATTR_INSTANCE] = { "instance", BLOBMSG_TYPE_STRING }, }; +enum { + SERVICE_LIST_ATTR_VERBOSE, + __SERVICE_LIST_ATTR_MAX, +}; + +static const struct blobmsg_policy service_list_attrs[__SERVICE_LIST_ATTR_MAX] = { + [SERVICE_LIST_ATTR_VERBOSE] = { "verbose", BLOBMSG_TYPE_BOOL }, +}; + +enum { + EVENT_TYPE, + EVENT_DATA, + __EVENT_MAX +}; + +static const struct blobmsg_policy event_policy[__EVENT_MAX] = { + [EVENT_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING }, + [EVENT_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE }, +}; static int service_handle_set(struct ubus_context *ctx, struct ubus_object *obj, @@ -148,11 +202,11 @@ service_handle_set(struct ubus_context *ctx, struct ubus_object *obj, s = avl_find_element(&services, name, s, avl); if (s) { - LOG("Update service %s\n", name); + DEBUG(1, "Update service %s\n", name); return service_update(s, msg, tb, add); } - LOG("Create service %s\n", name); + DEBUG(1, "Create service %s\n", name); s = service_alloc(name); if (!s) return UBUS_STATUS_UNKNOWN_ERROR; @@ -171,16 +225,24 @@ free: } static void -service_dump(struct service *s) +service_dump(struct service *s, int verbose) { struct service_instance *in; void *c, *i; c = blobmsg_open_table(&b, s->name); + + if (avl_is_empty(&s->instances.avl)) { + blobmsg_close_table(&b, c); + return; + } + i = blobmsg_open_table(&b, "instances"); vlist_for_each_element(&s->instances, in, node) - instance_dump(&b, in); + 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); } @@ -189,11 +251,18 @@ service_handle_list(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) { + struct blob_attr *tb[__SERVICE_LIST_ATTR_MAX]; struct service *s; + int verbose = 0; + + blobmsg_parse(service_list_attrs, __SERVICE_LIST_ATTR_MAX, tb, blob_data(msg), blob_len(msg)); + + if (tb[SERVICE_LIST_ATTR_VERBOSE] && blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE])) + verbose = 1; blob_buf_init(&b, 0); avl_for_each_element(&services, s, avl) - service_dump(s); + service_dump(s, verbose); ubus_send_reply(ctx, req, b.head); @@ -206,17 +275,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) @@ -265,6 +331,25 @@ service_handle_update(struct ubus_context *ctx, struct ubus_object *obj, return 0; } +static int +service_handle_event(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct blob_attr *tb[__EVENT_MAX]; + + if (!msg) + return UBUS_STATUS_INVALID_ARGUMENT; + + blobmsg_parse(event_policy, __EVENT_MAX, tb, blob_data(msg), blob_len(msg)); + if (!tb[EVENT_TYPE] || !tb[EVENT_DATA]) + return UBUS_STATUS_INVALID_ARGUMENT; + + trigger_event(blobmsg_get_string(tb[EVENT_TYPE]), tb[EVENT_DATA]); + + 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), @@ -272,6 +357,7 @@ static struct ubus_method main_object_methods[] = { UBUS_METHOD("delete", service_handle_delete, service_del_attrs), 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), }; static struct ubus_object_type main_object_type = @@ -284,7 +370,7 @@ static struct ubus_object main_object = { .n_methods = ARRAY_SIZE(main_object_methods), }; -void procd_init_service(struct ubus_context *ctx) +void ubus_init_service(struct ubus_context *ctx) { avl_init(&services, avl_strcmp, false, NULL); ubus_add_object(ctx, &main_object);