git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] daemon: send more error messages to the syslog
@ 2008-02-25 13:25 Johannes Sixt
  2008-02-25 19:02 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Johannes Sixt @ 2008-02-25 13:25 UTC (permalink / raw)
  To: Git Mailing List; +Cc: Junio C Hamano

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>
---
 daemon.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/daemon.c b/daemon.c
index 41a60af..dd0177f 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");

-- 
1.5.4.3.229.g5c72

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 1/2] daemon: send more error messages to the syslog
  2008-02-25 13:25 [PATCH 1/2] daemon: send more error messages to the syslog Johannes Sixt
@ 2008-02-25 19:02 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2008-02-25 19:02 UTC (permalink / raw)
  To: Johannes Sixt; +Cc: Git Mailing List

Johannes Sixt <j.sixt@viscovery.net> writes:

> 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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-02-25 19:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-25 13:25 [PATCH 1/2] daemon: send more error messages to the syslog Johannes Sixt
2008-02-25 19:02 ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).