From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Tue, 5 Sep 2023 11:24:54 +0000 (+0300)
Subject: lib-master: Add macro for DOVECOT_LOG_STDERR_TIMESTAMP_ENV
X-Git-Tag: 2.4.0~2594
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55e41b910fabf99a39cd0f4260807a5e44002ed5;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Add macro for DOVECOT_LOG_STDERR_TIMESTAMP_ENV
---

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index ee2c55bde8..e8e89a84e4 100644
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -350,7 +350,7 @@ int main(int argc, char *argv[])
 		/* read settings only after loading doveadm plugins, which
 		   may modify what settings are read */
 		doveadm_read_settings();
-		if (doveadm_debug && getenv("LOG_STDERR_TIMESTAMP") == NULL)
+		if (doveadm_debug && getenv(DOVECOT_LOG_STDERR_TIMESTAMP_ENV) == NULL)
 			i_set_failure_timestamp_format(master_service->set->log_timestamp);
 		master_service_init_stats_client(master_service, TRUE);
 		/* Load mail_plugins */
diff --git a/src/lib-master/master-interface.h b/src/lib-master/master-interface.h
index cd10055a2d..f783a7ce3d 100644
--- a/src/lib-master/master-interface.h
+++ b/src/lib-master/master-interface.h
@@ -88,6 +88,11 @@ enum master_login_state {
 */
 #define MASTER_SERVICE_LOG_SERVICE_ENV "LOG_SERVICE"
 
+/* getenv(DOVECOT_LOG_STDERR_TIMESTAMP_ENV) returns the format for timestamps
+   when logging to stderr. Unset means no timestamps are added.
+*/
+#define DOVECOT_LOG_STDERR_TIMESTAMP_ENV "LOG_STDERR_TIMESTAMP"
+
 /* getenv(DOVECOT_PRESERVE_ENVS_ENV) returns a space separated list of
    environments that should be preserved. */
 #define DOVECOT_PRESERVE_ENVS_ENV "DOVECOT_PRESERVE_ENVS"
diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index b7afdeb46c..91fcec0153 100644
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -195,7 +195,7 @@ master_service_exec_config(struct master_service *service,
 		if (input->preserve_user)
 			master_service_import_environment("USER");
 		if ((service->flags & MASTER_SERVICE_FLAG_STANDALONE) != 0)
-			master_service_import_environment("LOG_STDERR_TIMESTAMP");
+			master_service_import_environment(DOVECOT_LOG_STDERR_TIMESTAMP_ENV);
 
 		/* doveconf empties the environment before exec()ing us back
 		   if DOVECOT_PRESERVE_ENVS is set, so make sure it is. */
diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index f3006a7d49..9898c3d09c 100644
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -700,7 +700,7 @@ master_service_try_init_log(struct master_service *service,
 
 	if ((service->flags & MASTER_SERVICE_FLAG_STANDALONE) != 0 &&
 	    (service->flags & MASTER_SERVICE_FLAG_DONT_LOG_TO_STDERR) == 0) {
-		timestamp = getenv("LOG_STDERR_TIMESTAMP");
+		timestamp = getenv(DOVECOT_LOG_STDERR_TIMESTAMP_ENV);
 		if (timestamp != NULL)
 			i_set_failure_timestamp_format(timestamp);
 		i_set_failure_file("/dev/stderr", "");