lib-master: Add macro for MASTER_SERVICE_LOG_SERVICE_ENV

diff --git a/src/lib-master/master-interface.h b/src/lib-master/master-interface.h
index bb2fa8a71e6ebbe46d4e04dcabb950110327d978..cd10055a2de78ca351a893e9140f05cf0163d775 100644 (file)
--- a/src/lib-master/master-interface.h
+++ b/src/lib-master/master-interface.h
@@ -83,6 +83,11 @@ enum master_login_state {
 */
 #define MASTER_SERVICE_SOCKET_COUNT_ENV "SOCKET_COUNT"
 
+/* getenv(MASTER_SERVICE_LOG_SERVICE_ENV) will be set to '1' when
+   stderr is redirected to the log service.
+*/
+#define MASTER_SERVICE_LOG_SERVICE_ENV "LOG_SERVICE"
+
 /* 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.c b/src/lib-master/master-service.c
index 8c2304bdc34dafbc7fe50aa5a7db3bfc9a4fa045..f3006a7d490b6dbba32bdb0dd3c77f752e7e7bd6 100644 (file)
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -554,7 +554,7 @@ master_service_init(const char *name, enum master_service_flags flags,
 
        /* set up some kind of logging until we know exactly how and where
           we want to log */
-       if (getenv("LOG_SERVICE") != NULL)
+       if (getenv(MASTER_SERVICE_LOG_SERVICE_ENV) != NULL)
                i_set_failure_internal();
        if (getenv("USER") != NULL) {
                i_set_failure_prefix("%s(%s): ", service->configured_name,
@@ -707,7 +707,7 @@ master_service_try_init_log(struct master_service *service,
                return TRUE;
        }
 
-       if (getenv("LOG_SERVICE") != NULL && !service->log_directly) {
+       if (getenv(MASTER_SERVICE_LOG_SERVICE_ENV) != NULL && !service->log_directly) {
                /* logging via log service */
                i_set_failure_internal();
                i_set_failure_prefix("%s", prefix);

diff --git a/src/master/service-process.c b/src/master/service-process.c
index 7283811f98baa8ba426d170cf755bff843f966d0..03cfb4823e12c936aae743d397b0a7da67de3f3b 100644 (file)
--- a/src/master/service-process.c
+++ b/src/master/service-process.c
@@ -212,7 +212,7 @@ service_dup_fds(struct service *service)
                   to be lost. */
                i_assert(service->log_fd[1] != -1);
 
-               env_put("LOG_SERVICE", "1");
+               env_put(MASTER_SERVICE_LOG_SERVICE_ENV, "1");
                if (dup2(service->log_fd[1], STDERR_FILENO) < 0)
                        i_fatal("dup2(log fd) failed: %m");
                i_set_failure_internal();