diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-18 12:45:44 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-18 12:45:44 +0200 |
| commit | 9d8bb5629b6131be7c260ab3f9169ea1055c07f6 (patch) | |
| tree | fa017f714eb4c75f94b9902f66c59f24d4bb4bf6 /tools | |
| parent | 7b63cd6feda5087c43652bdcf8e694b544295d5b (diff) | |
| parent | 4c96ebdcfe075e80810b01257cf21ea1c9b3ec0e (diff) | |
| download | rsyslog-9d8bb5629b6131be7c260ab3f9169ea1055c07f6.tar.gz rsyslog-9d8bb5629b6131be7c260ab3f9169ea1055c07f6.tar.bz2 rsyslog-9d8bb5629b6131be7c260ab3f9169ea1055c07f6.zip | |
Merge branch 'helgrind' into perf
Conflicts:
ChangeLog
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 90b38748..e95d02c2 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2830,9 +2830,8 @@ static rsRetVal mainThread() CHKiRet(init()); - if(Debug) { + if(Debug && debugging_on) { dbgprintf("Debugging enabled, SIGUSR1 to turn off debugging.\n"); - debugging_on = 1; } /* Send a signal to the parent so it can terminate. */ @@ -3080,9 +3079,9 @@ doGlblProcessInit(void) fputs(" Already running.\n", stderr); exit(1); /* "good" exit, done if syslogd is already running */ } - } - else + } else { debugging_on = 1; + } /* tuck my process id away */ dbgprintf("Writing pidfile %s.\n", PidFile); |