#include <unistd.h>
#include <stdint.h>
#include <fcntl.h>
+#include <pwd.h>
+#include <libgen.h>
#include <libubox/md5.h>
INSTANCE_ATTR_LIMITS,
INSTANCE_ATTR_WATCH,
INSTANCE_ATTR_ERROR,
+ INSTANCE_ATTR_USER,
+ INSTANCE_ATTR_STDOUT,
+ INSTANCE_ATTR_STDERR,
__INSTANCE_ATTR_MAX
};
[INSTANCE_ATTR_LIMITS] = { "limits", BLOBMSG_TYPE_TABLE },
[INSTANCE_ATTR_WATCH] = { "watch", BLOBMSG_TYPE_ARRAY },
[INSTANCE_ATTR_ERROR] = { "error", BLOBMSG_TYPE_ARRAY },
+ [INSTANCE_ATTR_USER] = { "user", BLOBMSG_TYPE_STRING },
+ [INSTANCE_ATTR_STDOUT] = { "stdout", BLOBMSG_TYPE_BOOL },
+ [INSTANCE_ATTR_STDERR] = { "stderr", BLOBMSG_TYPE_BOOL },
};
struct instance_netdev {
{ NULL, 0 }
};
+static void closefd(int fd)
+{
+ if (fd > STDERR_FILENO)
+ close(fd);
+}
+
static void
instance_limits(const char *limit, const char *value)
{
}
static void
-instance_run(struct service_instance *in)
+instance_run(struct service_instance *in, int _stdout, int _stderr)
{
struct blobmsg_list_node *var;
struct blob_attr *cur;
char **argv;
int argc = 1; /* NULL terminated */
- int rem, fd;
+ int rem, _stdin;
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);
+
+ _stdin = open("/dev/null", O_RDONLY);
+
+ if (_stdout == -1)
+ _stdout = open("/dev/null", O_WRONLY);
+
+ if (_stderr == -1)
+ _stderr = open("/dev/null", O_WRONLY);
+
+ if (_stdin > -1) {
+ dup2(_stdin, STDIN_FILENO);
+ closefd(_stdin);
+ }
+ if (_stdout > -1) {
+ dup2(_stdout, STDOUT_FILENO);
+ closefd(_stdout);
+ }
+ if (_stderr > -1) {
+ dup2(_stderr, STDERR_FILENO);
+ closefd(_stderr);
+ }
+
+ if (in->uid || in->gid) {
+ setuid(in->uid);
+ setgid(in->gid);
}
execvp(argv[0], argv);
exit(127);
instance_start(struct service_instance *in)
{
int pid;
+ int opipe[2] = { -1, -1 };
+ int epipe[2] = { -1, -1 };
if (!avl_is_empty(&in->errors.avl)) {
LOG("Not starting instance %s::%s, an error was indicated\n", in->srv->name, in->name);
if (in->proc.pending)
return;
+ if (in->_stdout.fd.fd > -2) {
+ if (pipe(opipe)) {
+ ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
+ opipe[0] = opipe[1] = -1;
+ }
+ }
+
+ if (in->_stderr.fd.fd > -2) {
+ if (pipe(epipe)) {
+ ULOG_WARN("pipe() failed: %d (%s)\n", errno, strerror(errno));
+ epipe[0] = epipe[1] = -1;
+ }
+ }
+
in->restart = false;
in->halt = !in->respawn;
if (!pid) {
uloop_done();
- instance_run(in);
+ closefd(opipe[0]);
+ closefd(epipe[0]);
+ instance_run(in, opipe[1], epipe[1]);
return;
}
in->proc.pid = pid;
clock_gettime(CLOCK_MONOTONIC, &in->start);
uloop_process_add(&in->proc);
+
+ if (opipe[0] > -1) {
+ ustream_fd_init(&in->_stdout, opipe[0]);
+ closefd(opipe[1]);
+ }
+
+ if (epipe[0] > -1) {
+ ustream_fd_init(&in->_stderr, epipe[0]);
+ closefd(epipe[1]);
+ }
+
service_event("instance.start", in->srv->name, in->name);
}
static void
+instance_stdio(struct ustream *s, int prio, struct service_instance *in)
+{
+ char *newline, *str, *arg0, ident[32];
+ int len;
+
+ do {
+ str = ustream_get_read_buf(s, NULL);
+ if (!str)
+ break;
+
+ newline = strchr(str, '\n');
+ if (!newline)
+ break;
+
+ *newline = 0;
+ len = newline + 1 - str;
+
+ arg0 = basename(blobmsg_data(blobmsg_data(in->command)));
+ snprintf(ident, sizeof(ident), "%s[%d]", arg0, in->proc.pid);
+
+ ulog_open(ULOG_SYSLOG, LOG_DAEMON, ident);
+ ulog(prio, "%s\n", str);
+ ulog_open(ULOG_SYSLOG, LOG_DAEMON, "procd");
+
+ ustream_consume(s, len);
+ } while (1);
+}
+
+static void
+instance_stdout(struct ustream *s, int bytes)
+{
+ instance_stdio(s, LOG_INFO,
+ container_of(s, struct service_instance, _stdout.stream));
+}
+
+static void
+instance_stderr(struct ustream *s, int bytes)
+{
+ instance_stdio(s, LOG_ERR,
+ container_of(s, struct service_instance, _stderr.stream));
+}
+
+static void
instance_timeout(struct uloop_timeout *t)
{
struct service_instance *in;
if (in->nice != in_new->nice)
return true;
+ if (in->uid != in_new->uid)
+ return true;
+
+ if (in->gid != in_new->gid)
+ return true;
+
if (!blobmsg_list_equal(&in->limits, &in_new->limits))
return true;
close(fd);
}
+static void
+instance_fill_any(struct blobmsg_list *l, struct blob_attr *cur)
+{
+ if (!cur)
+ return;
+
+ blobmsg_list_fill(l, blobmsg_data(cur), blobmsg_data_len(cur), false);
+}
+
static bool
instance_fill_array(struct blobmsg_list *l, struct blob_attr *cur, blobmsg_update_cb cb, bool array)
{
in->respawn_retry = vals[2];
}
if (tb[INSTANCE_ATTR_TRIGGER]) {
- in->trigger = blob_memdup(tb[INSTANCE_ATTR_TRIGGER]);
- if (!in->trigger)
- return -1;
+ in->trigger = tb[INSTANCE_ATTR_TRIGGER];
trigger_add(in->trigger, in);
}
return false;
}
- if (!instance_fill_array(&in->env, tb[INSTANCE_ATTR_ENV], NULL, false))
- return false;
+ if (tb[INSTANCE_ATTR_USER]) {
+ struct passwd *p = getpwnam(blobmsg_get_string(tb[INSTANCE_ATTR_USER]));
+ if (p) {
+ in->uid = p->pw_uid;
+ in->gid = p->pw_gid;
+ }
+ }
+
+ if (tb[INSTANCE_ATTR_STDOUT] && blobmsg_get_bool(tb[INSTANCE_ATTR_STDOUT]))
+ in->_stdout.fd.fd = -1;
- if (!instance_fill_array(&in->data, tb[INSTANCE_ATTR_DATA], NULL, false))
+ if (tb[INSTANCE_ATTR_STDERR] && blobmsg_get_bool(tb[INSTANCE_ATTR_STDERR]))
+ in->_stderr.fd.fd = -1;
+
+ instance_fill_any(&in->data, tb[INSTANCE_ATTR_DATA]);
+
+ if (!instance_fill_array(&in->env, tb[INSTANCE_ATTR_ENV], NULL, false))
return false;
if (!instance_fill_array(&in->netdev, tb[INSTANCE_ATTR_NETDEV], instance_netdev_update, true))
void
instance_free(struct service_instance *in)
{
+ if (in->_stdout.fd.fd > -1) {
+ ustream_free(&in->_stdout.stream);
+ close(in->_stdout.fd.fd);
+ }
+
+ if (in->_stderr.fd.fd > -1) {
+ ustream_free(&in->_stderr.stream);
+ close(in->_stderr.fd.fd);
+ }
+
uloop_process_delete(&in->proc);
uloop_timeout_cancel(&in->timeout);
trigger_del(in);
watch_del(in);
- free(in->trigger);
instance_config_cleanup(in);
free(in->config);
free(in);
in->timeout.cb = instance_timeout;
in->proc.cb = instance_exit;
+ in->_stdout.fd.fd = -2;
+ in->_stdout.stream.string_data = true;
+ in->_stdout.stream.notify_read = instance_stdout;
+
+ in->_stderr.fd.fd = -2;
+ in->_stderr.stream.string_data = true;
+ in->_stderr.stream.notify_read = instance_stderr;
+
blobmsg_list_init(&in->netdev, struct instance_netdev, node, instance_netdev_cmp);
blobmsg_list_init(&in->file, struct instance_file, node, instance_file_cmp);
blobmsg_list_simple_init(&in->env);
blobmsg_close_table(b, e);
}
+ if (!avl_is_empty(&in->data.avl)) {
+ struct blobmsg_list_node *var;
+ void *e = blobmsg_open_table(b, "data");
+ blobmsg_list_for_each(&in->data, var)
+ blobmsg_add_blob(b, var->data);
+ blobmsg_close_table(b, e);
+ }
+
if (!avl_is_empty(&in->limits.avl)) {
struct blobmsg_list_node *var;
void *e = blobmsg_open_table(b, "limits");
projects / project / procd.git / blobdiff