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 /runtime | |
| 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 'runtime')
| -rw-r--r-- | runtime/debug.c | 4 | ||||
| -rw-r--r-- | runtime/debug.h | 5 |
2 files changed, 7 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"); diff --git a/runtime/debug.h b/runtime/debug.h index 8d9c1ceb..c011dd2d 100644 --- a/runtime/debug.h +++ b/runtime/debug.h @@ -29,6 +29,11 @@ #include <pthread.h> #include "obj-types.h" +/* some settings for various debug modes */ +#define DEBUG_OFF 0 +#define DEBUG_ONDEMAND 1 +#define DEBUG_FULL 2 + /* external static data elements (some time to be replaced) */ extern int Debug; /* debug flag - read-only after startup */ extern int debugging_on; /* read-only, except on sig USR1 */ |