aboutsummaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorJohannes Sixt <j.sixt@viscovery.net>2008-02-25 14:25:20 +0100
committerJunio C Hamano <gitster@pobox.com>2008-02-27 14:47:36 -0800
commit22665bbaab799b1f20a23039a5c759cd35d36939 (patch)
treeb2ce5c69dad47f3e6408545218cddb9943f70cc8 /daemon.c
parent81fa145917c40b68a5e2cca6afc6a10cdfdbd25b (diff)
downloadgit-22665bbaab799b1f20a23039a5c759cd35d36939.tar.gz
git-22665bbaab799b1f20a23039a5c759cd35d36939.tar.xz
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. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'daemon.c')
-rw-r--r--daemon.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/daemon.c b/daemon.c
index 41a60af62..dd0177f48 100644
--- a/daemon.c
+++ b/daemon.c
@@ -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");