* GNU General Public License for more details.
*/
+#include <libubox/blobmsg_json.h>
#include <libubox/avl-cmp.h>
#include "procd.h"
#include "service.h"
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)
{
vlist_flush_all(&s->instances);
avl_delete(&services, &s->avl);
+ trigger_del(s);
free(s->config);
free(s);
}
};
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 {
struct service_instance *in;
void *c, *i;
- if (avl_is_empty(&s->instances.avl))
+ if (avl_is_empty(&s->instances.avl) && !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);
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);