Skip to contentSkip to conversation

daemon: send more error messages to the syslog

PATCH In review Johannes Sixt 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 daemon: send more error messages to the syslog

There were a number of die() calls before the syslog was opened; hence, these error messages would have been sent to /dev/null in detached mode. Now we install the daemon-specific die routine before any error message is generated so that these messages go to the syslog.

---
 daemon.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
daemon.c +5 -5
index 41a60af..dd0177f 100644
@@ -1149,6 +1149,11 @@ int main(int argc, char **argv)
 		usage(daemon_usage);
 	}
 
+	if (log_syslog) {
+		openlog("git-daemon", 0, LOG_DAEMON);
+		set_die_routine(daemon_die);
+	}
+
 	if (inetd_mode && (group_name || user_name))
 		die("--user and --group are incompatible with --inetd");
 
@@ -1176,11 +1181,6 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if (log_syslog) {
-		openlog("git-daemon", 0, LOG_DAEMON);
-		set_die_routine(daemon_die);
-	}
-
 	if (strict_paths && (!ok_paths || !*ok_paths))
 		die("option --strict-paths requires a whitelist");
 
Signature · 1 line
1.5.4.3.229.g5c72
#1 lore raw
Quoted 4 lines · Johannes Sixt

There were a number of die() calls before the syslog was opened; hence, these error messages would have been sent to /dev/null in detached mode. Now we install the daemon-specific die routine before any error message is generated so that these messages go to the syslog.

Makes sense. Thanks.