diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-10 12:53:04 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-10 12:53:04 +0100 |
| commit | 384de6a4429436c981ad2dc87f4341dae767a89c (patch) | |
| tree | a2a7be6836208acb3fc8fbd87b95870cdf21d549 /runtime/debug.c | |
| parent | 2759e1dd846cb4e3bef78a849005afc8d0fa7438 (diff) | |
| parent | 2b5e15d549940c7ace9017eaf40d523e3741c9a2 (diff) | |
| download | rsyslog-384de6a4429436c981ad2dc87f4341dae767a89c.tar.gz rsyslog-384de6a4429436c981ad2dc87f4341dae767a89c.tar.xz rsyslog-384de6a4429436c981ad2dc87f4341dae767a89c.zip | |
Merge branch 'v4-beta'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/debug.c')
| -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 fa57a8d8..545ac876 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" @@ -1300,6 +1301,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")) { @@ -1308,6 +1310,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")) { |