f25fef61e0
We don't currently use the --log-destination option in the git-daemon systemd service or xinetd files. With this patch in place, we can.
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From e67d906d735166f2068f1e4cc393220483a97f30 Mon Sep 17 00:00:00 2001
|
|
From: Lucas Werkmeister <mail@lucaswerkmeister.de>
|
|
Date: Wed, 4 Apr 2018 00:13:07 +0200
|
|
Subject: [PATCH] daemon.c: fix condition for redirecting stderr
|
|
|
|
Since the --log-destination option was added in 0c591cacb ("daemon: add
|
|
--log-destination=(stderr|syslog|none)", 2018-02-04) with the explicit
|
|
goal of allowing logging to stderr when running in inetd mode, we should
|
|
not always redirect stderr to /dev/null in inetd mode, but rather only
|
|
when stderr is not being used for logging.
|
|
|
|
Signed-off-by: Lucas Werkmeister <mail@lucaswerkmeister.de>
|
|
Signed-off-by: Junio C Hamano <gitster@pobox.com>
|
|
---
|
|
daemon.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/daemon.c b/daemon.c
|
|
index fb538e3678997..7857169055385 100644
|
|
--- a/daemon.c
|
|
+++ b/daemon.c
|
|
@@ -1462,7 +1462,7 @@ int cmd_main(int argc, const char **argv)
|
|
die("base-path '%s' does not exist or is not a directory",
|
|
base_path);
|
|
|
|
- if (inetd_mode) {
|
|
+ if (log_destination != LOG_DESTINATION_STDERR) {
|
|
if (!freopen("/dev/null", "w", stderr))
|
|
die_errno("failed to redirect stderr to /dev/null");
|
|
}
|