diff options
| -rw-r--r-- | src/basic/log.c | 38 | ||||
| -rw-r--r-- | src/basic/log.h | 10 | ||||
| -rw-r--r-- | src/test/test-log.c | 27 |
3 files changed, 64 insertions, 11 deletions
diff --git a/src/basic/log.c b/src/basic/log.c index 7caa587ebf..75f59c4343 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -88,6 +88,8 @@ typedef struct LogContext { static thread_local LIST_HEAD(LogContext, _log_context) = NULL; static thread_local size_t _log_context_num_fields = 0; +static thread_local const char *log_prefix = NULL; + #if LOG_MESSAGE_VERIFICATION || defined(__COVERITY__) bool _log_message_dummy = false; /* Always false */ #endif @@ -395,7 +397,7 @@ static int write_to_console( header_time[FORMAT_TIMESTAMP_MAX], prefix[1 + DECIMAL_STR_MAX(int) + 2], tid_string[3 + DECIMAL_STR_MAX(pid_t) + 1]; - struct iovec iovec[9]; + struct iovec iovec[11]; const char *on = NULL, *off = NULL; size_t n = 0; @@ -434,6 +436,10 @@ static int write_to_console( if (on) iovec[n++] = IOVEC_MAKE_STRING(on); + if (log_prefix) { + iovec[n++] = IOVEC_MAKE_STRING(log_prefix); + iovec[n++] = IOVEC_MAKE_STRING(": "); + } iovec[n++] = IOVEC_MAKE_STRING(buffer); if (off) iovec[n++] = IOVEC_MAKE_STRING(off); @@ -493,6 +499,8 @@ static int write_to_syslog( IOVEC_MAKE_STRING(header_time), IOVEC_MAKE_STRING(program_invocation_short_name), IOVEC_MAKE_STRING(header_pid), + IOVEC_MAKE_STRING(strempty(log_prefix)), + IOVEC_MAKE_STRING(log_prefix ? ": " : ""), IOVEC_MAKE_STRING(buffer), }; const struct msghdr msghdr = { @@ -554,6 +562,8 @@ static int write_to_kmsg( IOVEC_MAKE_STRING(header_priority), IOVEC_MAKE_STRING(program_invocation_short_name), IOVEC_MAKE_STRING(header_pid), + IOVEC_MAKE_STRING(strempty(log_prefix)), + IOVEC_MAKE_STRING(log_prefix ? ": " : ""), IOVEC_MAKE_STRING(buffer), IOVEC_MAKE_STRING("\n"), }; @@ -665,13 +675,17 @@ static int write_to_journal( if (journal_fd < 0) return 0; - iovec_len = MIN(4 + _log_context_num_fields * 2, IOVEC_MAX); + iovec_len = MIN(6 + _log_context_num_fields * 2, IOVEC_MAX); iovec = newa(struct iovec, iovec_len); log_do_header(header, sizeof(header), level, error, file, line, func, object_field, object, extra_field, extra); iovec[n++] = IOVEC_MAKE_STRING(header); iovec[n++] = IOVEC_MAKE_STRING("MESSAGE="); + if (log_prefix) { + iovec[n++] = IOVEC_MAKE_STRING(log_prefix); + iovec[n++] = IOVEC_MAKE_STRING(": "); + } iovec[n++] = IOVEC_MAKE_STRING(buffer); iovec[n++] = IOVEC_MAKE_STRING("\n"); @@ -847,16 +861,9 @@ int log_object_internalv( /* Make sure that %m maps to the specified error (or "Success"). */ LOCAL_ERRNO(ERRNO_VALUE(error)); - /* Prepend the object name before the message */ - if (object) { - size_t n; - - n = strlen(object); - buffer = newa(char, n + 2 + LINE_MAX); - b = stpcpy(stpcpy(buffer, object), ": "); - } else - b = buffer = newa(char, LINE_MAX); + LOG_SET_PREFIX(object); + b = buffer = newa(char, LINE_MAX); (void) vsnprintf(b, LINE_MAX, format, ap); return log_dispatch_internal(level, error, file, line, func, @@ -1572,6 +1579,15 @@ void log_setup(void) { log_show_color(true); } +const char *_log_set_prefix(const char *prefix, bool force) { + const char *old = log_prefix; + + if (prefix || force) + log_prefix = prefix; + + return old; +} + static int saved_log_context_enabled = -1; bool log_context_enabled(void) { diff --git a/src/basic/log.h b/src/basic/log.h index 1e22293187..9008d47390 100644 --- a/src/basic/log.h +++ b/src/basic/log.h @@ -426,6 +426,16 @@ typedef struct LogRateLimit { #define log_ratelimit_error_errno(error, ...) log_ratelimit_full_errno(LOG_ERR, error, __VA_ARGS__) #define log_ratelimit_emergency_errno(error, ...) log_ratelimit_full_errno(log_emergency_level(), error, __VA_ARGS__) +const char *_log_set_prefix(const char *prefix, bool force); +static inline const char *_log_unset_prefixp(const char **p) { + assert(p); + _log_set_prefix(*p, true); + return NULL; +} + +#define LOG_SET_PREFIX(prefix) \ + _cleanup_(_log_unset_prefixp) _unused_ const char *CONCATENATE(_cleanup_log_unset_prefix_, UNIQ) = _log_set_prefix(prefix, false); + /* * The log context allows attaching extra metadata to log messages written to the journal via log.h. We keep * track of a thread local log context onto which we can push extra metadata fields that should be logged. diff --git a/src/test/test-log.c b/src/test/test-log.c index 4fc4bc9087..e337a3c7df 100644 --- a/src/test/test-log.c +++ b/src/test/test-log.c @@ -175,6 +175,32 @@ static void test_log_context(void) { assert_se(log_context_num_fields() == 0); } +static void test_log_prefix(void) { + { + LOG_SET_PREFIX("ABC"); + + test_log_struct(); + test_long_lines(); + test_log_syntax(); + + { + LOG_SET_PREFIX("QED"); + + test_log_struct(); + test_long_lines(); + test_log_syntax(); + } + + test_log_struct(); + test_long_lines(); + test_log_syntax(); + } + + test_log_struct(); + test_long_lines(); + test_log_syntax(); +} + int main(int argc, char* argv[]) { test_file(); @@ -188,6 +214,7 @@ int main(int argc, char* argv[]) { test_long_lines(); test_log_syntax(); test_log_context(); + test_log_prefix(); } return 0; |