diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-10 13:51:16 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-10 13:51:16 +0100 |
| commit | 2d232617fa250d913800cddda9d0003957303edf (patch) | |
| tree | fd2a63e5e7bc466e505f02692692c1e71b202dd7 /runtime | |
| parent | cd5f653ad8fa87727bf3ab12b90a41babaaf1ee5 (diff) | |
| parent | b4dd4ef83a51bc91a5861c0dd2809263e60cd05d (diff) | |
| download | rsyslog-2d232617fa250d913800cddda9d0003957303edf.tar.gz rsyslog-2d232617fa250d913800cddda9d0003957303edf.tar.xz rsyslog-2d232617fa250d913800cddda9d0003957303edf.zip | |
Merge branch 'v4-beta' into v4-devel
Conflicts:
ChangeLog
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/debug.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/runtime/debug.c b/runtime/debug.c index 1b592ef3..9547eee6 100644 --- a/runtime/debug.c +++ b/runtime/debug.c @@ -51,6 +51,7 @@ #include "rsyslog.h" #include "debug.h" #include "atomic.h" +#include "cfsysline.h" #include "obj.h" @@ -1263,6 +1264,7 @@ dbgGetRuntimeOptions(void) "NoLogTimestamp\n" "Nostdoout\n" "filetrace=file (may be provided multiple times)\n" + "DebugOnDemand - enables debugging on USR1, but does not turn on output\n" "\nSee debug.html in your doc set or http://www.rsyslog.com for details\n"); exit(1); } else if(!strcasecmp((char*)optname, "debug")) { @@ -1271,6 +1273,13 @@ dbgGetRuntimeOptions(void) */ Debug = 1; debugging_on = 1; + } else if(!strcasecmp((char*)optname, "debugondemand")) { + /* Enables debugging, but turns off debug output */ + Debug = 1; + debugging_on = 1; + dbgprintf("Note: debug on demand turned on via configuraton file, " + "use USR1 signal to activate.\n"); + debugging_on = 0; } else if(!strcasecmp((char*)optname, "logfuncflow")) { bLogFuncFlow = 1; } else if(!strcasecmp((char*)optname, "logallocfree")) { |