struct avl_tree services;
static struct blob_buf b;
+static struct ubus_context *ctx;
static void
service_instance_add(struct service *s, struct blob_attr *attr)
DEBUG(2, "Create instance %s::%s\n", in_n->srv->name, in_n->name);
instance_start(in_n);
}
+ blob_buf_init(&b, 0);
+ trigger_event("instance.update", b.head);
}
static struct service *
};
static int
-service_update(struct service *s, struct blob_attr *config, struct blob_attr **tb, bool add)
+service_update(struct service *s, struct blob_attr **tb, bool add)
{
struct blob_attr *cur;
int rem;
service_validate_del(s);
if (tb[SERVICE_SET_TRIGGER] && blobmsg_data_len(tb[SERVICE_SET_TRIGGER])) {
- s->trigger = malloc(blob_pad_len(tb[SERVICE_SET_TRIGGER]));
+ s->trigger = blob_memdup(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);
}
vlist_flush(&s->instances);
}
- rcnow(s->name, "running");
+ rc(s->name, "running");
return 0;
}
static void
service_delete(struct service *s)
{
+ service_event("service.stop", s->name, NULL);
vlist_flush_all(&s->instances);
avl_delete(&services, &s->avl);
trigger_del(s);
- s->trigger = NULL;
free(s->trigger);
free(s);
service_validate_del(s);
};
enum {
+ SERVICE_LIST_ATTR_NAME,
SERVICE_LIST_ATTR_VERBOSE,
__SERVICE_LIST_ATTR_MAX,
};
static const struct blobmsg_policy service_list_attrs[__SERVICE_LIST_ATTR_MAX] = {
+ [SERVICE_LIST_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
[SERVICE_LIST_ATTR_VERBOSE] = { "verbose", BLOBMSG_TYPE_BOOL },
};
[VALIDATE_SERVICE] = { .name = "service", .type = BLOBMSG_TYPE_STRING },
};
+static const struct blobmsg_policy get_data_policy[] = {
+ { "type", BLOBMSG_TYPE_STRING }
+};
+
static int
service_handle_set(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *tb[__SERVICE_SET_MAX], *cur;
struct service *s = NULL;
const char *name;
- int ret = UBUS_STATUS_INVALID_ARGUMENT;
bool add = !strcmp(method, "add");
+ int ret;
blobmsg_parse(service_set_attrs, __SERVICE_SET_MAX, tb, blob_data(msg), blob_len(msg));
cur = tb[SERVICE_ATTR_NAME];
if (!cur)
- goto free;
+ return UBUS_STATUS_INVALID_ARGUMENT;
name = blobmsg_data(cur);
s = avl_find_element(&services, name, s, avl);
if (s) {
DEBUG(2, "Update service %s\n", name);
- return service_update(s, msg, tb, add);
+ return service_update(s, tb, add);
}
DEBUG(2, "Create service %s\n", name);
if (!s)
return UBUS_STATUS_UNKNOWN_ERROR;
- ret = service_update(s, msg, tb, add);
+ ret = service_update(s, tb, add);
if (ret)
- goto free;
+ return ret;
avl_insert(&services, &s->avl);
- return 0;
+ service_event("service.start", s->name, NULL);
-free:
- free(msg);
- return ret;
+ return 0;
}
static void
-service_dump(struct service *s, int verbose)
+service_dump(struct service *s, bool 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;
+ if (!avl_is_empty(&s->instances.avl)) {
+ i = blobmsg_open_table(&b, "instances");
+ vlist_for_each_element(&s->instances, in, node)
+ instance_dump(&b, in, verbose);
+ blobmsg_close_table(&b, i);
}
-
- i = blobmsg_open_table(&b, "instances");
- 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);
if (verbose && !list_empty(&s->validators))
{
struct blob_attr *tb[__SERVICE_LIST_ATTR_MAX];
struct service *s;
- int verbose = 0;
+ const char *name = NULL;
+ bool verbose = false;
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;
+ if (tb[SERVICE_LIST_ATTR_VERBOSE])
+ verbose = blobmsg_get_bool(tb[SERVICE_LIST_ATTR_VERBOSE]);
+ if (tb[SERVICE_LIST_ATTR_NAME])
+ name = blobmsg_get_string(tb[SERVICE_LIST_ATTR_NAME]);
blob_buf_init(&b, 0);
- avl_for_each_element(&services, s, avl)
+ avl_for_each_element(&services, s, avl) {
+ if (name && strcmp(s->name, name) != 0)
+ continue;
+
service_dump(s, verbose);
+ }
ubus_send_reply(ctx, req, b.head);
return 0;
}
+static int
+service_get_data(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct service_instance *in;
+ struct service *s;
+ struct blob_attr *tb;
+ const char *type = NULL;
+
+ blobmsg_parse(get_data_policy, 1, &tb, blob_data(msg), blob_len(msg));
+ if (tb)
+ type = blobmsg_data(tb);
+
+ blob_buf_init(&b, 0);
+ avl_for_each_element(&services, s, avl) {
+ void *cs = NULL;
+
+ vlist_for_each_element(&s->instances, in, node) {
+ struct blobmsg_list_node *var;
+ void *ci = NULL;
+
+ blobmsg_list_for_each(&in->data, var) {
+ if (type &&
+ strcmp(blobmsg_name(var->data), type) != 0)
+ continue;
+
+ if (!cs)
+ cs = blobmsg_open_table(&b, s->name);
+ if (!ci)
+ ci = blobmsg_open_table(&b, in->name);
+
+ blobmsg_add_blob(&b, var->data);
+ }
+
+ if (ci)
+ blobmsg_close_table(&b, ci);
+ }
+
+ if (cs)
+ blobmsg_close_table(&b, cs);
+ }
+
+ ubus_send_reply(ctx, req, b.head);
+ 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),
- UBUS_METHOD("list", service_handle_list, service_attrs),
+ UBUS_METHOD("list", service_handle_list, service_list_attrs),
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),
UBUS_METHOD("validate", service_handle_validate, validate_policy),
+ UBUS_METHOD("get_data", service_get_data, get_data_policy),
};
static struct ubus_object_type main_object_type =
}
blobmsg_close_array(&b, command);
respawn = blobmsg_open_array(&b, "respawn");
- blobmsg_add_string(&b, NULL, "1");
blobmsg_add_string(&b, NULL, "3600");
- blobmsg_add_string(&b, NULL, "10");
+ blobmsg_add_string(&b, NULL, "1");
+ blobmsg_add_string(&b, NULL, "0");
blobmsg_close_array(&b, respawn);
blobmsg_close_table(&b, instance);
blobmsg_close_table(&b, instances);
return service_handle_set(NULL, NULL, NULL, "add", b.head);
}
-void ubus_init_service(struct ubus_context *ctx)
+void service_event(const char *type, const char *service, const char *instance)
+{
+ if (!ctx)
+ return;
+
+ blob_buf_init(&b, 0);
+ blobmsg_add_string(&b, "service", service);
+ if (instance)
+ blobmsg_add_string(&b, "instance", instance);
+ ubus_notify(ctx, &main_object, type, b.head, -1);
+}
+
+void ubus_init_service(struct ubus_context *_ctx)
{
+ ctx = _ctx;
ubus_add_object(ctx, &main_object);
}
projects / project / procd.git / blobdiff