diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-20 18:51:25 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-20 18:51:25 +0100 |
| commit | 4e3589857a2b2667d4b9ad92fe152acb85283aca (patch) | |
| tree | 43ccbfb0a52f090ee5b1af589da008d3c333d5ed /tools | |
| parent | 7d20954653fa0f8999822554dcb048ee60dbbe58 (diff) | |
| parent | 5b55ab75e27861241981ae447ed3d1b8ad968deb (diff) | |
| download | rsyslog-4e3589857a2b2667d4b9ad92fe152acb85283aca.tar.gz rsyslog-4e3589857a2b2667d4b9ad92fe152acb85283aca.tar.xz rsyslog-4e3589857a2b2667d4b9ad92fe152acb85283aca.zip | |
Merge branch 'v4-devel' into tmp
Conflicts:
ChangeLog
tests/Makefile.am
tests/sndrcv_drvr.sh
tools/syslogd.c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index d510bc41..2470b6fa 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -569,7 +569,7 @@ logmsgInternal(int iErr, int pri, uchar *msg, int flags) * permits us to process unmodified config files which otherwise contain a * supressor statement. */ - if(((Debug || NoFork) && bErrMsgToStderr) || iConfigVerify) { + if(((Debug == DEBUG_FULL || NoFork) && bErrMsgToStderr) || iConfigVerify) { if(LOG_PRI(pri) == LOG_ERR) fprintf(stderr, "rsyslogd: %s\n", msg); } @@ -977,9 +977,10 @@ static void doDie(int sig) static int iRetries = 0; /* debug aid */ dbgprintf(MSG1); if(Debug) + if(Debug == DEBUG_FULL) write(1, MSG1, sizeof(MSG1) - 1); if(iRetries++ == 4) { - if(Debug) + if(Debug == DEBUG_FULL) write(1, MSG2, sizeof(MSG2) - 1); abort(); } @@ -2169,7 +2170,7 @@ static rsRetVal mainThread() * is still in its infancy (and not really done), we currently accept this issue. * rgerhards, 2009-06-29 */ - if(!(Debug || NoFork)) { + if(!(Debug == DEBUG_FULL || NoFork)) { close(1); close(2); bErrMsgToStderr = 0; @@ -2361,7 +2362,7 @@ doGlblProcessInit(void) thrdInit(); - if( !(Debug || NoFork) ) + if( !(Debug == DEBUG_FULL || NoFork) ) { DBGPRINTF("Checking pidfile.\n"); if (!check_pid(PidFile)) |