#include "procd.h"
#include "service.h"
#include "instance.h"
+#include "rcS.h"
struct avl_tree services;
static struct blob_buf b;
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);
struct blob_attr *cur;
int rem;
- if (s->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 = 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);
}
vlist_flush(&s->instances);
}
+ rc(s->name, "running");
+
return 0;
}
vlist_flush_all(&s->instances);
avl_delete(&services, &s->avl);
trigger_del(s);
- free(s->config);
+ s->trigger = NULL;
+ free(s->trigger);
free(s);
}
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);
- 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);
+ if (verbose && s->trigger)
+ blobmsg_add_blob(&b, s->trigger);
blobmsg_close_table(&b, c);
}