X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Flog.c;h=32ec581d8d591e5b3bf9637b8505bfd9b0545dd3;hp=56469b32b5d44dfe69e822921130cbe2c8c7163b;hb=01c94c5d0aff09b4c0e429d483c8eeba40017071;hpb=8f16f51d9323e87cc78d28e9656984c028071f94 diff --git a/src/shared/log.c b/src/shared/log.c index 56469b32b..32ec581d8 100644 --- a/src/shared/log.c +++ b/src/shared/log.c @@ -34,6 +34,7 @@ #include "missing.h" #include "macro.h" #include "socket-util.h" +#include "formats-util.h" #define SNDBUF_SIZE (8*1024*1024) @@ -106,8 +107,8 @@ void log_close_syslog(void) { } static int create_log_socket(int type) { - int fd; struct timeval tv; + int fd; fd = socket(AF_UNIX, type|SOCK_CLOEXEC, 0); if (fd < 0) @@ -128,12 +129,14 @@ static int create_log_socket(int type) { } static int log_open_syslog(void) { - int r; - union sockaddr_union sa = { + + static const union sockaddr_union sa = { .un.sun_family = AF_UNIX, .un.sun_path = "/dev/log", }; + int r; + if (syslog_fd >= 0) return 0; @@ -176,10 +179,12 @@ void log_close_journal(void) { } static int log_open_journal(void) { - union sockaddr_union sa = { + + static const union sockaddr_union sa = { .un.sun_family = AF_UNIX, .un.sun_path = "/run/systemd/journal/socket", }; + int r; if (journal_fd >= 0) @@ -303,26 +308,30 @@ void log_set_facility(int facility) { static int write_to_console( int level, int error, - const char*file, + const char *file, int line, const char *func, const char *object_field, const char *object, const char *buffer) { - char location[64]; - struct iovec iovec[5] = {}; + char location[64], prefix[1 + DECIMAL_STR_MAX(int) + 2]; + struct iovec iovec[6] = {}; unsigned n = 0; bool highlight; if (console_fd < 0) return 0; + if (log_target == LOG_TARGET_CONSOLE_PREFIXED) { + sprintf(prefix, "<%i>", level); + IOVEC_SET_STRING(iovec[n++], prefix); + } + highlight = LOG_PRI(level) <= LOG_ERR && show_color; if (show_location) { - snprintf(location, sizeof(location), "(%s:%u) ", file, line); - char_array_0(location); + snprintf(location, sizeof(location), "(%s:%i) ", file, line); IOVEC_SET_STRING(iovec[n++], location); } @@ -359,14 +368,16 @@ static int write_to_console( static int write_to_syslog( int level, int error, - const char*file, + const char *file, int line, const char *func, const char *object_field, const char *object, const char *buffer) { - char header_priority[1 + DECIMAL_STR_MAX(int) + 2], header_time[64], header_pid[1 + DECIMAL_STR_MAX(pid_t) + 4]; + char header_priority[2 + DECIMAL_STR_MAX(int) + 1], + header_time[64], + header_pid[4 + DECIMAL_STR_MAX(pid_t) + 1]; struct iovec iovec[5] = {}; struct msghdr msghdr = { .msg_iov = iovec, @@ -378,8 +389,7 @@ static int write_to_syslog( if (syslog_fd < 0) return 0; - snprintf(header_priority, sizeof(header_priority), "<%i>", level); - char_array_0(header_priority); + xsprintf(header_priority, "<%i>", level); t = (time_t) (now(CLOCK_REALTIME) / USEC_PER_SEC); tm = localtime(&t); @@ -389,8 +399,7 @@ static int write_to_syslog( if (strftime(header_time, sizeof(header_time), "%h %e %T ", tm) <= 0) return -EINVAL; - snprintf(header_pid, sizeof(header_pid), "["PID_FMT"]: ", getpid()); - char_array_0(header_pid); + xsprintf(header_pid, "["PID_FMT"]: ", getpid()); IOVEC_SET_STRING(iovec[0], header_priority); IOVEC_SET_STRING(iovec[1], header_time); @@ -429,17 +438,15 @@ static int write_to_kmsg( const char *object, const char *buffer) { - char header_priority[1 + DECIMAL_STR_MAX(int) + 2], header_pid[1 + DECIMAL_STR_MAX(pid_t) + 4]; + char header_priority[2 + DECIMAL_STR_MAX(int) + 1], + header_pid[4 + DECIMAL_STR_MAX(pid_t) + 1]; struct iovec iovec[5] = {}; if (kmsg_fd < 0) return 0; - snprintf(header_priority, sizeof(header_priority), "<%i>", level); - char_array_0(header_priority); - - snprintf(header_pid, sizeof(header_pid), "["PID_FMT"]: ", getpid()); - char_array_0(header_pid); + xsprintf(header_priority, "<%i>", level); + xsprintf(header_pid, "["PID_FMT"]: ", getpid()); IOVEC_SET_STRING(iovec[0], header_priority); IOVEC_SET_STRING(iovec[1], program_invocation_short_name); @@ -488,7 +495,6 @@ static int log_do_header( isempty(object) ? "" : object, isempty(object) ? "" : "\n", program_invocation_short_name); - header[size - 1] = '\0'; return 0; } @@ -529,17 +535,17 @@ static int write_to_journal( static int log_dispatch( int level, int error, - const char*file, + const char *file, int line, const char *func, const char *object_field, const char *object, char *buffer) { - int r = 0; + assert(buffer); if (log_target == LOG_TARGET_NULL) - return 0; + return -error; /* Patch in LOG_DAEMON facility if necessary */ if ((level & LOG_FACMASK) == 0) @@ -569,8 +575,7 @@ static int log_dispatch( if (k != -EAGAIN) log_close_journal(); log_open_kmsg(); - } else if (k > 0) - r++; + } } if (log_target == LOG_TARGET_SYSLOG_OR_KMSG || @@ -581,8 +586,7 @@ static int log_dispatch( if (k != -EAGAIN) log_close_syslog(); log_open_kmsg(); - } else if (k > 0) - r++; + } } if (k <= 0 && @@ -596,26 +600,22 @@ static int log_dispatch( if (k < 0) { log_close_kmsg(); log_open_console(); - } else if (k > 0) - r++; + } } - if (k <= 0) { - k = write_to_console(level, error, file, line, func, object_field, object, buffer); - if (k < 0) - return k; - } + if (k <= 0) + (void) write_to_console(level, error, file, line, func, object_field, object, buffer); buffer = e; } while (buffer); - return r; + return -error; } int log_dump_internal( int level, int error, - const char*file, + const char *file, int line, const char *func, char *buffer) { @@ -624,8 +624,11 @@ int log_dump_internal( /* This modifies the buffer... */ + if (error < 0) + error = -error; + if (_likely_(LOG_PRI(level) > log_max_level)) - return 0; + return -error; return log_dispatch(level, error, file, line, func, NULL, NULL, buffer); } @@ -642,15 +645,17 @@ int log_internalv( PROTECT_ERRNO; char buffer[LINE_MAX]; + if (error < 0) + error = -error; + if (_likely_(LOG_PRI(level) > log_max_level)) - return 0; + return -error; /* Make sure that %m maps to the specified error */ if (error != 0) - errno = abs(error); + errno = error; vsnprintf(buffer, sizeof(buffer), format, ap); - char_array_0(buffer); return log_dispatch(level, error, file, line, func, NULL, NULL, buffer); } @@ -663,8 +668,8 @@ int log_internal( const char *func, const char *format, ...) { - int r; va_list ap; + int r; va_start(ap, format); r = log_internalv(level, error, file, line, func, format, ap); @@ -687,15 +692,17 @@ int log_object_internalv( PROTECT_ERRNO; char buffer[LINE_MAX]; + if (error < 0) + error = -error; + if (_likely_(LOG_PRI(level) > log_max_level)) - return 0; + return -error; /* Make sure that %m maps to the specified error */ if (error != 0) - errno = abs(error); + errno = error; vsnprintf(buffer, sizeof(buffer), format, ap); - char_array_0(buffer); return log_dispatch(level, error, file, line, func, object_field, object, buffer); } @@ -710,8 +717,8 @@ int log_object_internal( const char *object, const char *format, ...) { - int r; va_list ap; + int r; va_start(ap, format); r = log_object_internalv(level, error, file, line, func, object_field, object, format, ap); @@ -737,7 +744,6 @@ static void log_assert( snprintf(buffer, sizeof(buffer), format, text, file, line, func); REENABLE_WARNING; - char_array_0(buffer); log_abort_msg = buffer; log_dispatch(level, 0, file, line, func, NULL, NULL, buffer); @@ -771,27 +777,27 @@ int log_struct_internal( const char *func, const char *format, ...) { + char buf[LINE_MAX]; + bool found = false; PROTECT_ERRNO; va_list ap; - int r; + + if (error < 0) + error = -error; if (_likely_(LOG_PRI(level) > log_max_level)) - return 0; + return -error; if (log_target == LOG_TARGET_NULL) - return 0; + return -error; if ((level & LOG_FACMASK) == 0) level = log_facility | LOG_PRI(level); - if (error < 0) - error = -error; - if ((log_target == LOG_TARGET_AUTO || log_target == LOG_TARGET_JOURNAL_OR_KMSG || log_target == LOG_TARGET_JOURNAL) && journal_fd >= 0) { - char header[LINE_MAX]; struct iovec iovec[17] = {}; unsigned n = 0, i; @@ -799,6 +805,7 @@ int log_struct_internal( .msg_iov = iovec, }; static const char nl = '\n'; + bool fallback = false; /* If the journal is available do structured logging */ log_do_header(header, sizeof(header), level, error, file, line, func, NULL, NULL); @@ -806,17 +813,20 @@ int log_struct_internal( va_start(ap, format); while (format && n + 1 < ELEMENTSOF(iovec)) { - char *buf; va_list aq; + char *m; /* We need to copy the va_list structure, * since vasprintf() leaves it afterwards at * an undefined location */ + if (error != 0) + errno = error; + va_copy(aq, ap); - if (vasprintf(&buf, format, aq) < 0) { + if (vasprintf(&m, format, aq) < 0) { va_end(aq); - r = -ENOMEM; + fallback = true; goto finish; } va_end(aq); @@ -825,7 +835,7 @@ int log_struct_internal( * the next format string */ VA_FORMAT_ADVANCE(format, ap); - IOVEC_SET_STRING(iovec[n++], buf); + IOVEC_SET_STRING(iovec[n++], m); iovec[n].iov_base = (char*) &nl; iovec[n].iov_len = 1; @@ -836,49 +846,45 @@ int log_struct_internal( mh.msg_iovlen = n; - if (sendmsg(journal_fd, &mh, MSG_NOSIGNAL) < 0) - r = -errno; - else - r = 1; + (void) sendmsg(journal_fd, &mh, MSG_NOSIGNAL); finish: va_end(ap); for (i = 1; i < n; i += 2) free(iovec[i].iov_base); - } else { - char buf[LINE_MAX]; - bool found = false; + if (!fallback) + return -error; + } - /* Fallback if journal logging is not available */ + /* Fallback if journal logging is not available or didn't work. */ - va_start(ap, format); - while (format) { - va_list aq; + va_start(ap, format); + while (format) { + va_list aq; - va_copy(aq, ap); - vsnprintf(buf, sizeof(buf), format, aq); - va_end(aq); - char_array_0(buf); + if (error != 0) + errno = error; - if (startswith(buf, "MESSAGE=")) { - found = true; - break; - } + va_copy(aq, ap); + vsnprintf(buf, sizeof(buf), format, aq); + va_end(aq); - VA_FORMAT_ADVANCE(format, ap); - - format = va_arg(ap, char *); + if (startswith(buf, "MESSAGE=")) { + found = true; + break; } - va_end(ap); - if (found) - r = log_dispatch(level, error, file, line, func, NULL, NULL, buf + 8); - else - r = -EINVAL; + VA_FORMAT_ADVANCE(format, ap); + + format = va_arg(ap, char *); } + va_end(ap); - return r; + if (!found) + return -error; + + return log_dispatch(level, error, file, line, func, NULL, NULL, buf + 8); } int log_set_target_from_string(const char *e) { @@ -909,7 +915,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { * The systemd.log_xyz= settings are parsed by all tools, and * so is "debug". * - * However, "quiet" is only parsed by PID 1! + * However, "quiet" is only parsed by PID 1, and only turns of + * status output to /dev/console, but does not alter the log + * level. */ if (streq(key, "debug") && !value) @@ -942,7 +950,11 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { void log_parse_environment(void) { const char *e; - (void) parse_proc_cmdline(parse_proc_cmdline_item); + if (get_ctty_devnr(0, NULL) < 0) + /* Only try to read the command line in daemons. + We assume that anything that has a controlling + tty is user stuff. */ + (void) parse_proc_cmdline(parse_proc_cmdline_item); e = secure_getenv("SYSTEMD_LOG_TARGET"); if (e && log_set_target_from_string(e) < 0) @@ -1008,7 +1020,8 @@ int log_show_location_from_string(const char *e) { } bool log_on_console(void) { - if (log_target == LOG_TARGET_CONSOLE) + if (log_target == LOG_TARGET_CONSOLE || + log_target == LOG_TARGET_CONSOLE_PREFIXED) return true; return syslog_fd < 0 && kmsg_fd < 0 && journal_fd < 0; @@ -1016,6 +1029,7 @@ bool log_on_console(void) { static const char *const log_target_table[_LOG_TARGET_MAX] = { [LOG_TARGET_CONSOLE] = "console", + [LOG_TARGET_CONSOLE_PREFIXED] = "console-prefixed", [LOG_TARGET_KMSG] = "kmsg", [LOG_TARGET_JOURNAL] = "journal", [LOG_TARGET_JOURNAL_OR_KMSG] = "journal-or-kmsg", @@ -1035,7 +1049,7 @@ void log_received_signal(int level, const struct signalfd_siginfo *si) { get_process_comm(si->ssi_pid, &p); log_full(level, - "Received SIG%s from PID "PID_FMT" (%s).", + "Received SIG%s from PID %"PRIu32" (%s).", signal_to_string(si->ssi_signo), si->ssi_pid, strna(p)); } else