зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
81fa145917
Коммит
22665bbaab
10
daemon.c
10
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");
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче