INSTANCE_ATTR_DATA,
INSTANCE_ATTR_NETDEV,
INSTANCE_ATTR_FILE,
+ INSTANCE_ATTR_TRIGGER,
INSTANCE_ATTR_NICE,
__INSTANCE_ATTR_MAX
};
[INSTANCE_ATTR_DATA] = { "data", BLOBMSG_TYPE_TABLE },
[INSTANCE_ATTR_NETDEV] = { "netdev", BLOBMSG_TYPE_ARRAY },
[INSTANCE_ATTR_FILE] = { "file", BLOBMSG_TYPE_ARRAY },
+ [INSTANCE_ATTR_TRIGGER] = { "triggers", BLOBMSG_TYPE_ARRAY },
[INSTANCE_ATTR_NICE] = { "nice", BLOBMSG_TYPE_INT32 },
};
struct blob_attr *cur;
char **argv;
int argc = 1; /* NULL terminated */
- int rem;
+ int rem, fd;
if (in->nice)
setpriority(PRIO_PROCESS, 0, in->nice);
argv[argc++] = blobmsg_data(cur);
argv[argc] = NULL;
+ fd = open("/dev/null", O_RDWR);
+ if (fd > -1) {
+ dup2(fd, STDIN_FILENO);
+ dup2(fd, STDOUT_FILENO);
+ dup2(fd, STDERR_FILENO);
+ if (fd > STDERR_FILENO)
+ close(fd);
+ }
execvp(argv[0], argv);
exit(127);
}
return;
if (!pid) {
+ uloop_done();
instance_run(in);
return;
}
return false;
in->command = cur;
+ in->trigger = tb[INSTANCE_ATTR_TRIGGER];
+ if (in->trigger) {
+ trigger_add(in->trigger, in);
+ }
if ((cur = tb[INSTANCE_ATTR_NICE])) {
in->nice = (int8_t) blobmsg_get_u32(cur);
if (in->nice < -20 || in->nice > 20)
blobmsg_list_move(&in->env, &in_src->env);
blobmsg_list_move(&in->data, &in_src->data);
blobmsg_list_move(&in->netdev, &in_src->netdev);
+ in->trigger = in_src->trigger;
in->command = in_src->command;
in->name = in_src->name;
in->node.avl.key = in_src->node.avl.key;
{
uloop_process_delete(&in->proc);
uloop_timeout_cancel(&in->timeout);
+ trigger_del(in);
instance_config_cleanup(in);
free(in->config);
free(in);
in->valid = instance_config_parse(in);
}
-void instance_dump(struct blob_buf *b, struct service_instance *in)
+void instance_dump(struct blob_buf *b, struct service_instance *in, int verbose)
{
void *i;
if (in->proc.pending)
blobmsg_add_u32(b, "pid", in->proc.pid);
blobmsg_add_blob(b, in->command);
+ if (verbose && in->trigger)
+ blobmsg_add_blob(b, in->trigger);
blobmsg_close_table(b, i);
}