summaryrefslogtreecommitdiffstats
path: root/runtime/debug.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-11-20 18:51:25 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-11-20 18:51:25 +0100
commit4e3589857a2b2667d4b9ad92fe152acb85283aca (patch)
tree43ccbfb0a52f090ee5b1af589da008d3c333d5ed /runtime/debug.c
parent7d20954653fa0f8999822554dcb048ee60dbbe58 (diff)
parent5b55ab75e27861241981ae447ed3d1b8ad968deb (diff)
downloadrsyslog-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 'runtime/debug.c')
-rw-r--r--runtime/debug.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/debug.c b/runtime/debug.c
index 545ac876..a517b1ba 100644
--- a/runtime/debug.c
+++ b/runtime/debug.c
@@ -1308,11 +1308,11 @@ dbgGetRuntimeOptions(void)
/* this is earlier in the process than the -d option, as such it
* allows us to spit out debug messages from the very beginning.
*/
- Debug = 1;
+ Debug = DEBUG_FULL;
debugging_on = 1;
} else if(!strcasecmp((char*)optname, "debugondemand")) {
/* Enables debugging, but turns off debug output */
- Debug = 1;
+ Debug = DEBUG_ONDEMAND;
debugging_on = 1;
dbgprintf("Note: debug on demand turned on via configuraton file, "
"use USR1 signal to activate.\n");