From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 20 Apr 2020 18:28:40 +0000 (+0300)
Subject: lib-master: Add master_service_init_log_with_pid()
X-Git-Tag: 2.3.11.2~187
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=711e30e313126555b5129136f3f22025727c843c;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Add master_service_init_log_with_pid()
---

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index 9e072d2d1e..fd4a61c82e 100644
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -5,6 +5,7 @@
 #include "lib-event-private.h"
 #include "event-filter.h"
 #include "ioloop.h"
+#include "hostpid.h"
 #include "path-util.h"
 #include "array.h"
 #include "strescape.h"
@@ -514,6 +515,12 @@ void master_service_init_log(struct master_service *service,
 		service->log_initialized = TRUE;
 }
 
+void master_service_init_log_with_pid(struct master_service *service)
+{
+	master_service_init_log(service, t_strdup_printf(
+		"%s(%s): ", service->configured_name, my_pid));
+}
+
 void master_service_init_stats_client(struct master_service *service,
 				      bool silent_notfound_errors)
 {
diff --git a/src/lib-master/master-service.h b/src/lib-master/master-service.h
index 92adbbf8d4..b8f9904873 100644
--- a/src/lib-master/master-service.h
+++ b/src/lib-master/master-service.h
@@ -131,6 +131,8 @@ void master_service_env_clean(void);
    functions. The following calls change the log prefix. */
 void master_service_init_log(struct master_service *service,
 			     const char *prefix);
+/* Initialize/change log prefix to "configured_name(my_pid): " */
+void master_service_init_log_with_pid(struct master_service *service);
 /* Initialize stats client (if it's not already initialized). This is called
    automatically if MASTER_SERVICE_FLAG_SEND_STATS is enabled. If
    silent_notfound_errors is set, connect() errors aren't logged if they're