From: Timo Sirainen <tss@iki.fi>
Date: Fri, 10 Apr 2009 18:15:03 +0000 (-0400)
Subject: doveadm: Log to stderr.
X-Git-Tag: 2.0.alpha1~986
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d2b3ce2c6ef62334985ece4f0ab8b154e0e9560;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: Log to stderr.

--HG--
branch : HEAD
---

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index eaedf3745d..5ae49a2256 100644
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -113,6 +113,11 @@ void master_service_init_log(struct master_service *service, const char *prefix)
 {
 	const char *path;
 
+	if ((service->flags & MASTER_SERVICE_FLAG_LOG_TO_STDERR) != 0) {
+		i_set_failure_file("/dev/stderr", "");
+		return;
+	}
+
 	if (getenv("LOG_TO_MASTER") != NULL && !service->log_directly) {
 		/* logging via master process */
 		i_set_failure_internal();
diff --git a/src/lib-master/master-service.h b/src/lib-master/master-service.h
index c7839d11b1..d9326d9f37 100644
--- a/src/lib-master/master-service.h
+++ b/src/lib-master/master-service.h
@@ -7,7 +7,9 @@ enum master_service_flags {
 	/* stdin/stdout already contains a client which we want to serve */
 	MASTER_SERVICE_FLAG_STD_CLIENT		= 0x01,
 	/* this process is currently running standalone without a master */
-	MASTER_SERVICE_FLAG_STANDALONE		= 0x02
+	MASTER_SERVICE_FLAG_STANDALONE		= 0x02,
+	/* Log to stderr instead of the configured log file */
+	MASTER_SERVICE_FLAG_LOG_TO_STDERR	= 0x04
 };
 
 struct master_service;
diff --git a/src/util/doveadm.c b/src/util/doveadm.c
index 1ce8a37ac7..221add79c3 100644
--- a/src/util/doveadm.c
+++ b/src/util/doveadm.c
@@ -85,7 +85,9 @@ int main(int argc, char *argv[])
 	const char *getopt_str, *user;
 	int c;
 
-	service = master_service_init("doveadm", MASTER_SERVICE_FLAG_STANDALONE,
+	service = master_service_init("doveadm",
+				      MASTER_SERVICE_FLAG_STANDALONE |
+				      MASTER_SERVICE_FLAG_LOG_TO_STDERR,
 				      argc, argv);
 
 	user = getenv("USER");