diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-01-27 16:58:30 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-01-27 16:58:30 +0100 |
| commit | 4c7ab3bcc6db2aaddd0515944f282e3dd6ab056a (patch) | |
| tree | 2b60a6d27a7bae4125876bb3782194c45830c27d /tools/syslogd.c | |
| parent | d5360aa57436bb931c513677bc2cbdb1733a4c6b (diff) | |
| parent | ce11f7bdb8db977a8b00b28d9b84d1b1c924f3c3 (diff) | |
| download | rsyslog-4c7ab3bcc6db2aaddd0515944f282e3dd6ab056a.tar.gz rsyslog-4c7ab3bcc6db2aaddd0515944f282e3dd6ab056a.tar.xz rsyslog-4c7ab3bcc6db2aaddd0515944f282e3dd6ab056a.zip | |
Merge branch 'beta'
Conflicts:
tools/omfile.c
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 2cac8fe4..76b107e8 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1903,9 +1903,11 @@ static void doDie(int sig) # define MSG1 "DoDie called.\n" # define MSG2 "DoDie called 5 times - unconditional exit\n" static int iRetries = 0; /* debug aid */ - write(1, MSG1, sizeof(MSG1)); + if(Debug || NoFork) + write(1, MSG1, sizeof(MSG1) - 1); if(iRetries++ == 4) { - write(1, MSG2, sizeof(MSG2)); + if(Debug || NoFork) + write(1, MSG2, sizeof(MSG2) - 1); abort(); } bFinished = sig; |