X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-server.c;h=4f47eb1c11ccdee5fa2a13507afc8c57f14c2e02;hb=cac914e643a50c72893c5478f6886e0978f8fa18;hp=44ba916f1045d56f262f9d9385afc206a2c03ae1;hpb=670b110c3b59dfa335ac43065b2038400d1d04a9;p=elogind.git diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 44ba916f1..4f47eb1c1 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -180,25 +180,6 @@ static uint64_t available_space(Server *s, bool verbose) { return s->cached_available_space; } -static void server_read_file_gid(Server *s) { - const char *g = "systemd-journal"; - int r; - - assert(s); - - if (s->file_gid_valid) - return; - - r = get_group_creds(&g, &s->file_gid); - if (r < 0) - log_warning("Failed to resolve '%s' group: %s", g, strerror(-r)); - - /* if we couldn't read the gid, then it will be 0, but that's - * fine and we shouldn't try to resolve the group again, so - * let's just pretend it worked right-away. */ - s->file_gid_valid = true; -} - void server_fix_perms(Server *s, JournalFile *f, uid_t uid) { int r; #ifdef HAVE_ACL @@ -209,11 +190,9 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) { assert(f); - server_read_file_gid(s); - - r = fchmod_and_fchown(f->fd, 0640, 0, s->file_gid); + r = fchmod(f->fd, 0640); if (r < 0) - log_warning("Failed to fix access mode/rights on %s, ignoring: %s", f->path, strerror(-r)); + log_warning("Failed to fix access mode on %s, ignoring: %s", f->path, strerror(-r)); #ifdef HAVE_ACL if (uid <= 0) @@ -352,13 +331,12 @@ void server_rotate(Server *s) { } void server_sync(Server *s) { + static const struct itimerspec sync_timer_disable = {}; JournalFile *f; void *k; Iterator i; int r; - static const struct itimerspec sync_timer_disable = {}; - if (s->system_journal) { r = journal_file_set_offline(s->system_journal); if (r < 0) @@ -443,7 +421,7 @@ bool shall_try_append_again(JournalFile *f, int r) { return true; } -static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, unsigned n) { +static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, unsigned n, int priority) { JournalFile *f; bool vacuumed = false; int r; @@ -469,7 +447,7 @@ static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, unsigned r = journal_file_append_entry(f, NULL, iovec, n, &s->seqnum, NULL, NULL); if (r >= 0) { - server_schedule_sync(s); + server_schedule_sync(s, priority); return; } @@ -499,7 +477,8 @@ static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, unsigned size += iovec[i].iov_len; log_error("Failed to write entry (%d items, %zu bytes) despite vacuuming, ignoring: %s", n, size, strerror(-r)); - } + } else + server_schedule_sync(s, priority); } static void dispatch_message_real( @@ -509,6 +488,7 @@ static void dispatch_message_real( struct timeval *tv, const char *label, size_t label_len, const char *unit_id, + int priority, pid_t object_pid) { char pid[sizeof("_PID=") + DECIMAL_STR_MAX(pid_t)], @@ -523,7 +503,6 @@ static void dispatch_message_real( o_owner_uid[sizeof("OBJECT_SYSTEMD_OWNER_UID=") + DECIMAL_STR_MAX(uid_t)]; uid_t object_uid; gid_t object_gid; - char *x; sd_id128_t id; int r; @@ -578,6 +557,13 @@ static void dispatch_message_real( IOVEC_SET_STRING(iovec[n++], x); } + r = get_process_capeff(ucred->pid, &t); + if (r >= 0) { + x = strappenda("_CAP_EFFECTIVE=", t); + free(t); + IOVEC_SET_STRING(iovec[n++], x); + } + #ifdef HAVE_AUDIT r = audit_session_from_pid(ucred->pid, &audit); if (r >= 0) { @@ -616,19 +602,26 @@ static void dispatch_message_real( if (cg_path_get_unit(c, &t) >= 0) { x = strappenda("_SYSTEMD_UNIT=", t); free(t); - } else if (cg_path_get_user_unit(c, &t) >= 0) { + IOVEC_SET_STRING(iovec[n++], x); + } else if (unit_id && !session) { + x = strappenda("_SYSTEMD_UNIT=", unit_id); + IOVEC_SET_STRING(iovec[n++], x); + } + + if (cg_path_get_user_unit(c, &t) >= 0) { x = strappenda("_SYSTEMD_USER_UNIT=", t); free(t); - } else if (unit_id) { - if (session) - x = strappenda("_SYSTEMD_USER_UNIT=", unit_id); - else - x = strappenda("_SYSTEMD_UNIT=", unit_id); - } else - x = NULL; - - if (x) IOVEC_SET_STRING(iovec[n++], x); + } else if (unit_id && session) { + x = strappenda("_SYSTEMD_USER_UNIT=", unit_id); + IOVEC_SET_STRING(iovec[n++], x); + } + + if (cg_path_get_slice(c, &t) >= 0) { + x = strappenda("_SYSTEMD_SLICE=", t); + free(t); + IOVEC_SET_STRING(iovec[n++], x); + } free(c); } @@ -721,14 +714,14 @@ static void dispatch_message_real( if (cg_path_get_unit(c, &t) >= 0) { x = strappenda("OBJECT_SYSTEMD_UNIT=", t); free(t); - } else if (cg_path_get_user_unit(c, &t) >= 0) { + IOVEC_SET_STRING(iovec[n++], x); + } + + if (cg_path_get_user_unit(c, &t) >= 0) { x = strappenda("OBJECT_SYSTEMD_USER_UNIT=", t); free(t); - } else - x = NULL; - - if (x) IOVEC_SET_STRING(iovec[n++], x); + } free(c); } @@ -778,7 +771,7 @@ static void dispatch_message_real( else journal_uid = 0; - write_to_journal(s, journal_uid, iovec, n); + write_to_journal(s, journal_uid, iovec, n, priority); } void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) { @@ -812,7 +805,7 @@ void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ucred.uid = getuid(); ucred.gid = getgid(); - dispatch_message_real(s, iovec, n, ELEMENTSOF(iovec), &ucred, NULL, NULL, 0, NULL, 0); + dispatch_message_real(s, iovec, n, ELEMENTSOF(iovec), &ucred, NULL, NULL, 0, NULL, LOG_INFO, 0); } void server_dispatch_message( @@ -838,6 +831,11 @@ void server_dispatch_message( if (LOG_PRI(priority) > s->max_level_store) return; + /* Stop early in case the information will not be stored + * in a journal. */ + if (s->storage == STORAGE_NONE) + return; + if (!ucred) goto finish; @@ -873,7 +871,7 @@ void server_dispatch_message( "Suppressed %u messages from %s", rl - 1, path); finish: - dispatch_message_real(s, iovec, n, m, ucred, tv, label, label_len, unit_id, object_pid); + dispatch_message_real(s, iovec, n, m, ucred, tv, label, label_len, unit_id, priority, object_pid); } @@ -884,8 +882,10 @@ static int system_journal_open(Server *s) { char ids[33]; r = sd_id128_get_machine(&machine); - if (r < 0) + if (r < 0) { + log_error("Failed to get machine id: %s", strerror(-r)); return r; + } sd_id128_to_string(machine, ids); @@ -910,11 +910,12 @@ static int system_journal_open(Server *s) { if (r >= 0) server_fix_perms(s, s->system_journal, 0); - } else if (r < 0) { - if (r != -ENOENT && r != -EROFS) - log_warning("Failed to open system journal: %s", strerror(-r)); + else if (r < 0) { + if (r != -ENOENT && r != -EROFS) + log_warning("Failed to open system journal: %s", strerror(-r)); - r = 0; + r = 0; + } } if (!s->runtime_journal && @@ -986,10 +987,8 @@ int server_flush_to_var(Server *s) { log_debug("Flushing to /var..."); r = sd_id128_get_machine(&machine); - if (r < 0) { - log_error("Failed to get machine id: %s", strerror(-r)); + if (r < 0) return r; - } r = sd_journal_open(&j, SD_JOURNAL_RUNTIME_ONLY); if (r < 0) { @@ -1061,7 +1060,8 @@ int process_event(Server *s, struct epoll_event *ev) { ssize_t n; if (ev->events != EPOLLIN) { - log_error("Got invalid event from epoll."); + log_error("Got invalid event from epoll for %s: %"PRIx32, + "signal fd", ev->events); return -EIO; } @@ -1078,6 +1078,8 @@ int process_event(Server *s, struct epoll_event *ev) { } if (sfsi.ssi_signo == SIGUSR1) { + log_info("Received request to flush runtime journal from PID %"PRIu32, + sfsi.ssi_pid); touch("/run/systemd/journal/flushed"); server_flush_to_var(s); server_sync(s); @@ -1085,6 +1087,8 @@ int process_event(Server *s, struct epoll_event *ev) { } if (sfsi.ssi_signo == SIGUSR2) { + log_info("Received request to rotate journal from PID %"PRIu32, + sfsi.ssi_pid); server_rotate(s); server_vacuum(s); return 1; @@ -1110,8 +1114,12 @@ int process_event(Server *s, struct epoll_event *ev) { } else if (ev->data.fd == s->dev_kmsg_fd) { int r; - if (ev->events != EPOLLIN) { - log_error("Got invalid event from epoll."); + if (ev->events & EPOLLERR) + log_warning("/dev/kmsg buffer overrun, some messages lost."); + + if (!(ev->events & EPOLLIN)) { + log_error("Got invalid event from epoll for %s: %"PRIx32, + "/dev/kmsg", ev->events); return -EIO; } @@ -1125,7 +1133,9 @@ int process_event(Server *s, struct epoll_event *ev) { ev->data.fd == s->syslog_fd) { if (ev->events != EPOLLIN) { - log_error("Got invalid event from epoll."); + log_error("Got invalid event from epoll for %s: %"PRIx32, + ev->data.fd == s->native_fd ? "native fd" : "syslog fd", + ev->events); return -EIO; } @@ -1223,15 +1233,8 @@ int process_event(Server *s, struct epoll_event *ev) { } if (ev->data.fd == s->syslog_fd) { - char *e; - if (n > 0 && n_fds == 0) { - e = memchr(s->buffer, '\n', n); - if (e) - *e = 0; - else - s->buffer[n] = 0; - + s->buffer[n] = 0; server_process_syslog_message(s, strstrip(s->buffer), ucred, tv, label, label_len); } else if (n_fds > 0) log_warning("Got file descriptors via syslog socket. Ignoring."); @@ -1253,7 +1256,8 @@ int process_event(Server *s, struct epoll_event *ev) { } else if (ev->data.fd == s->stdout_fd) { if (ev->events != EPOLLIN) { - log_error("Got invalid event from epoll."); + log_error("Got invalid event from epoll for %s: %"PRIx32, + "stdout fd", ev->events); return -EIO; } @@ -1264,7 +1268,8 @@ int process_event(Server *s, struct epoll_event *ev) { StdoutStream *stream; if ((ev->events|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) { - log_error("Got invalid event from epoll."); + log_error("Got invalid event from epoll for %s: %"PRIx32, + "stdout stream", ev->events); return -EIO; } @@ -1409,11 +1414,17 @@ static int server_open_sync_timer(Server *s) { return 0; } -int server_schedule_sync(Server *s) { +int server_schedule_sync(Server *s, int priority) { int r; assert(s); + if (priority <= LOG_CRIT) { + /* Immediately sync to disk when this is of priority CRIT, ALERT, EMERG */ + server_sync(s); + return 0; + } + if (s->sync_scheduled) return 0;