summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-01 16:11:11 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-01 16:11:11 +0200
commit56fc7acc06ad9b22f88566c1e9dc5ed4f203de45 (patch)
tree9726d5647bdcfc2fd80bc48e8a12b69d02abeb59 /tools
parent68f7a7bfd21a63c6b3f753341ac48a8873a260a7 (diff)
parent9020647cdcdb0ef132491838e36c870f4e4e90ea (diff)
downloadrsyslog-56fc7acc06ad9b22f88566c1e9dc5ed4f203de45.tar.gz
rsyslog-56fc7acc06ad9b22f88566c1e9dc5ed4f203de45.tar.xz
rsyslog-56fc7acc06ad9b22f88566c1e9dc5ed4f203de45.zip
Merge branch 'v5-stable' into v6-stable
Diffstat (limited to 'tools')
-rw-r--r--tools/syslogd.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 84fe8453..1b057710 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2501,7 +2501,7 @@ doGlblProcessInit(void)
if( !(Debug == DEBUG_FULL || NoFork) )
{
- DBGPRINTF("Checking pidfile.\n");
+ DBGPRINTF("Checking pidfile '%s'.\n", PidFile);
if (!check_pid(PidFile))
{
memset(&sigAct, 0, sizeof (sigAct));
@@ -2509,6 +2509,9 @@ doGlblProcessInit(void)
sigAct.sa_handler = doexit;
sigaction(SIGTERM, &sigAct, NULL);
+ /* stop writing debug messages to stdout (if debugging is on) */
+ stddbg = -1;
+
if (fork()) {
/* Parent process
*/
@@ -2571,7 +2574,7 @@ doGlblProcessInit(void)
}
/* tuck my process id away */
- DBGPRINTF("Writing pidfile %s.\n", PidFile);
+ DBGPRINTF("Writing pidfile '%s'.\n", PidFile);
if (!check_pid(PidFile))
{
if (!write_pid(PidFile))