From 9a795eb60306eede5efc7e8ec5d584457a49e32e Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 24 Aug 2017 17:00:30 +0300 Subject: [PATCH] log: Include PID in prefix for internal log messages. --- src/log/log-connection.c | 2 +- src/log/log-connection.h | 1 + src/log/main.c | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/log/log-connection.c b/src/log/log-connection.c index 5080d1324a..b300a87ee9 100644 --- a/src/log/log-connection.c +++ b/src/log/log-connection.c @@ -145,7 +145,7 @@ client_log_ctx(struct log_connection *log, } i_set_failure_prefix("%s", prefix); i_log_type(ctx, "%s", text); - i_set_failure_prefix("log: "); + i_set_failure_prefix("%s", global_log_prefix); } static void diff --git a/src/log/log-connection.h b/src/log/log-connection.h index 8d2a368a0b..291942f4fc 100644 --- a/src/log/log-connection.h +++ b/src/log/log-connection.h @@ -4,6 +4,7 @@ struct log_connection; extern bool verbose_proctitle; +extern const char *global_log_prefix; void log_connection_create(struct log_error_buffer *errorbuf, int fd, int listen_fd); diff --git a/src/log/main.c b/src/log/main.c index e547683f6c..e58a9c20a8 100644 --- a/src/log/main.c +++ b/src/log/main.c @@ -2,6 +2,7 @@ #include "lib.h" #include "lib-signals.h" +#include "hostpid.h" #include "restrict-access.h" #include "master-interface.h" #include "master-service.h" @@ -13,12 +14,13 @@ #include bool verbose_proctitle; +const char *global_log_prefix; static struct log_error_buffer *errorbuf; static void sig_reopen_logs(const siginfo_t *si ATTR_UNUSED, void *context ATTR_UNUSED) { - master_service_init_log(master_service, "log: "); + master_service_init_log(master_service, global_log_prefix); } static void main_init(void) @@ -62,7 +64,8 @@ int main(int argc, char *argv[]) /* use log prefix and log to stderr until we've configured the real logging */ - i_set_failure_file("/dev/stderr", "log: "); + global_log_prefix = t_strdup_printf("log(%s): ", my_pid); + i_set_failure_file("/dev/stderr", global_log_prefix); if (master_getopt(master_service) > 0) return FATAL_DEFAULT; @@ -70,7 +73,7 @@ int main(int argc, char *argv[]) if (master_service_settings_read_simple(master_service, NULL, &error) < 0) i_fatal("Error reading configuration: %s", error); - master_service_init_log(master_service, "log: "); + master_service_init_log(master_service, global_log_prefix); verbose_proctitle = master_service_settings_get(master_service)->verbose_proctitle; -- 2.47.3