X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-stream.c;h=36fc755260f585f13ea29e9956d4ef06bedc2fa4;hb=020d59000f86b3d98be763eaee6a2671f0427e46;hp=98fdf781bff9a05596d8d17a7d528b8492d7eb70;hpb=a45b9fca6b91a767dcd9060cfcb30617dad234c7;p=elogind.git diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index 98fdf781b..36fc75526 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -21,17 +21,20 @@ #include #include -#include +#include #ifdef HAVE_SELINUX #include #endif +#include "sd-event.h" #include "socket-util.h" -#include "journald.h" +#include "selinux-util.h" +#include "journald-server.h" #include "journald-stream.h" #include "journald-syslog.h" #include "journald-kmsg.h" +#include "journald-console.h" #define STDOUT_STREAMS_MAX 4096 @@ -68,14 +71,18 @@ struct StdoutStream { char buffer[LINE_MAX+1]; size_t length; + sd_event_source *event_source; + LIST_FIELDS(StdoutStream, stdout_stream); }; static int stdout_stream_log(StdoutStream *s, const char *p) { struct iovec iovec[N_IOVEC_META_FIELDS + 5]; - char *message = NULL, *syslog_priority = NULL, *syslog_facility = NULL, *syslog_identifier = NULL; - unsigned n = 0; int priority; + char syslog_priority[] = "PRIORITY=\0"; + char syslog_facility[sizeof("SYSLOG_FACILITY=") + DECIMAL_STR_MAX(priority)]; + _cleanup_free_ char *message = NULL, *syslog_identifier = NULL; + unsigned n = 0; char *label = NULL; size_t label_len = 0; @@ -88,7 +95,7 @@ static int stdout_stream_log(StdoutStream *s, const char *p) { priority = s->priority; if (s->level_prefix) - syslog_parse_priority((char**) &p, &priority); + syslog_parse_priority(&p, &priority, false); if (s->forward_to_syslog || s->server->forward_to_syslog) server_forward_syslog(s->server, syslog_fixup_facility(priority), s->identifier, p, &s->ucred, NULL); @@ -101,12 +108,13 @@ static int stdout_stream_log(StdoutStream *s, const char *p) { IOVEC_SET_STRING(iovec[n++], "_TRANSPORT=stdout"); - if (asprintf(&syslog_priority, "PRIORITY=%i", priority & LOG_PRIMASK) >= 0) - IOVEC_SET_STRING(iovec[n++], syslog_priority); + syslog_priority[strlen("PRIORITY=")] = '0' + LOG_PRI(priority); + IOVEC_SET_STRING(iovec[n++], syslog_priority); - if (priority & LOG_FACMASK) - if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", LOG_FAC(priority)) >= 0) - IOVEC_SET_STRING(iovec[n++], syslog_facility); + if (priority & LOG_FACMASK) { + snprintf(syslog_facility, sizeof(syslog_facility), "SYSLOG_FACILITY=%i", LOG_FAC(priority)); + IOVEC_SET_STRING(iovec[n++], syslog_facility); + } if (s->identifier) { syslog_identifier = strappend("SYSLOG_IDENTIFIER=", s->identifier); @@ -125,13 +133,7 @@ static int stdout_stream_log(StdoutStream *s, const char *p) { } #endif - server_dispatch_message(s->server, iovec, n, ELEMENTSOF(iovec), &s->ucred, NULL, label, label_len, s->unit_id, priority); - - free(message); - free(syslog_priority); - free(syslog_facility); - free(syslog_identifier); - + server_dispatch_message(s->server, iovec, n, ELEMENTSOF(iovec), &s->ucred, NULL, label, label_len, s->unit_id, priority, 0); return 0; } @@ -173,7 +175,7 @@ static int stdout_stream_line(StdoutStream *s, char *p) { case STDOUT_STREAM_PRIORITY: r = safe_atoi(p, &s->priority); - if (r < 0 || s->priority <= 0 || s->priority >= 999) { + if (r < 0 || s->priority < 0 || s->priority > 999) { log_warning("Failed to parse log priority line."); return -EINVAL; } @@ -282,12 +284,18 @@ static int stdout_stream_scan(StdoutStream *s, bool force_flush) { return 0; } -int stdout_stream_process(StdoutStream *s) { +static int stdout_stream_process(sd_event_source *es, int fd, uint32_t revents, void *userdata) { + StdoutStream *s = userdata; ssize_t l; int r; assert(s); + if ((revents|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) { + log_error("Got invalid event from epoll for stdout stream: %"PRIx32, revents); + goto terminate; + } + l = read(s->fd, s->buffer+s->length, sizeof(s->buffer)-1-s->length); if (l < 0) { @@ -295,24 +303,24 @@ int stdout_stream_process(StdoutStream *s) { return 0; log_warning("Failed to read from stream: %m"); - return -errno; + goto terminate; } if (l == 0) { - r = stdout_stream_scan(s, true); - if (r < 0) - return r; - - return 0; + stdout_stream_scan(s, true); + goto terminate; } s->length += l; r = stdout_stream_scan(s, false); if (r < 0) - return r; + goto terminate; return 1; +terminate: + stdout_stream_free(s); + return 0; } void stdout_stream_free(StdoutStream *s) { @@ -321,15 +329,16 @@ void stdout_stream_free(StdoutStream *s) { if (s->server) { assert(s->server->n_stdout_streams > 0); s->server->n_stdout_streams --; - LIST_REMOVE(StdoutStream, stdout_stream, s->server->stdout_streams, s); + LIST_REMOVE(stdout_stream, s->server->stdout_streams, s); } - if (s->fd >= 0) { - if (s->server) - epoll_ctl(s->server->epoll_fd, EPOLL_CTL_DEL, s->fd, NULL); + if (s->event_source) { + sd_event_source_set_enabled(s->event_source, SD_EVENT_OFF); + s->event_source = sd_event_source_unref(s->event_source); + } + if (s->fd >= 0) close_nointr_nofail(s->fd); - } #ifdef HAVE_SELINUX if (s->security_context) @@ -337,17 +346,22 @@ void stdout_stream_free(StdoutStream *s) { #endif free(s->identifier); + free(s->unit_id); free(s); } -int stdout_stream_new(Server *s) { +static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revents, void *userdata) { + Server *s = userdata; StdoutStream *stream; int fd, r; - socklen_t len; - struct epoll_event ev; assert(s); + if (revents != EPOLLIN) { + log_error("Got invalid event from epoll for stdout server fd: %"PRIx32, revents); + return -EIO; + } + fd = accept4(s->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC); if (fd < 0) { if (errno == EAGAIN) @@ -371,52 +385,57 @@ int stdout_stream_new(Server *s) { stream->fd = fd; - len = sizeof(stream->ucred); - if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &stream->ucred, &len) < 0) { + r = getpeercred(fd, &stream->ucred); + if (r < 0) { log_error("Failed to determine peer credentials: %m"); - r = -errno; goto fail; } #ifdef HAVE_SELINUX - if (getpeercon(fd, &stream->security_context) < 0 && errno != ENOPROTOOPT) - log_error("Failed to determine peer security context: %m"); + if (use_selinux()) { + if (getpeercon(fd, &stream->security_context) < 0 && errno != ENOPROTOOPT) + log_error("Failed to determine peer security context: %m"); + } #endif if (shutdown(fd, SHUT_WR) < 0) { log_error("Failed to shutdown writing side of socket: %m"); - r = -errno; goto fail; } - zero(ev); - ev.data.ptr = stream; - ev.events = EPOLLIN; - if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) { - log_error("Failed to add stream to event loop: %m"); - r = -errno; + r = sd_event_add_io(s->event, &stream->event_source, fd, EPOLLIN, stdout_stream_process, stream); + if (r < 0) { + log_error("Failed to add stream to event loop: %s", strerror(-r)); + goto fail; + } + + r = sd_event_source_set_priority(stream->event_source, SD_EVENT_PRIORITY_NORMAL+5); + if (r < 0) { + log_error("Failed to adjust stdout event source priority: %s", strerror(-r)); goto fail; } stream->server = s; - LIST_PREPEND(StdoutStream, stdout_stream, s->stdout_streams, stream); + LIST_PREPEND(stdout_stream, s->stdout_streams, stream); s->n_stdout_streams ++; return 0; fail: stdout_stream_free(stream); - return r; + return 0; } int server_open_stdout_socket(Server *s) { - union sockaddr_union sa; int r; - struct epoll_event ev; assert(s); if (s->stdout_fd < 0) { + union sockaddr_union sa = { + .un.sun_family = AF_UNIX, + .un.sun_path = "/run/systemd/journal/stdout", + }; s->stdout_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); if (s->stdout_fd < 0) { @@ -424,10 +443,6 @@ int server_open_stdout_socket(Server *s) { return -errno; } - zero(sa); - sa.un.sun_family = AF_UNIX; - strncpy(sa.un.sun_path, "/run/systemd/journal/stdout", sizeof(sa.un.sun_path)); - unlink(sa.un.sun_path); r = bind(s->stdout_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path)); @@ -439,18 +454,22 @@ int server_open_stdout_socket(Server *s) { chmod(sa.un.sun_path, 0666); if (listen(s->stdout_fd, SOMAXCONN) < 0) { - log_error("liste() failed: %m"); + log_error("listen() failed: %m"); return -errno; } } else fd_nonblock(s->stdout_fd, 1); - zero(ev); - ev.events = EPOLLIN; - ev.data.fd = s->stdout_fd; - if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->stdout_fd, &ev) < 0) { - log_error("Failed to add stdout server fd to epoll object: %m"); - return -errno; + r = sd_event_add_io(s->event, &s->stdout_event_source, s->stdout_fd, EPOLLIN, stdout_stream_new, s); + if (r < 0) { + log_error("Failed to add stdout server fd to event source: %s", strerror(-r)); + return r; + } + + r = sd_event_source_set_priority(s->stdout_event_source, SD_EVENT_PRIORITY_NORMAL+10); + if (r < 0) { + log_error("Failed to adjust priority of stdout server event source: %s", strerror(-r)); + return r; } return 0;