diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-29 11:23:04 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-29 11:23:04 +0200 |
| commit | f4ec11fa779e7348f68ece1b3b50d499a0526ace (patch) | |
| tree | 3e847b7fa3f9ddbda3266461c10daa4cec68f582 /runtime | |
| parent | 370bfa988db48ede39e74bcfae0d1909ecb0af66 (diff) | |
| parent | a4980cbde24b48c5540435d27d01651d5ca46d03 (diff) | |
| download | rsyslog-f4ec11fa779e7348f68ece1b3b50d499a0526ace.tar.gz rsyslog-f4ec11fa779e7348f68ece1b3b50d499a0526ace.tar.xz rsyslog-f4ec11fa779e7348f68ece1b3b50d499a0526ace.zip | |
Merge branch 'v5-stable' into v5-beta
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/debug.c | 4 | ||||
| -rw-r--r-- | runtime/debug.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/runtime/debug.c b/runtime/debug.c index d02bd516..fa33b99d 100644 --- a/runtime/debug.c +++ b/runtime/debug.c @@ -68,7 +68,7 @@ static int bPrintAllDebugOnExit = 0; static int bAbortTrace = 1; /* print a trace after SIGABRT or SIGSEGV */ static char *pszAltDbgFileName = NULL; /* if set, debug output is *also* sent to here */ static int altdbg = -1; /* and the handle for alternate debug output */ -static int stddbg; +int stddbg = 1; /* the handle for regular debug output, set to stdout if not forking, -1 otherwise */ /* list of files/objects that should be printed */ typedef struct dbgPrintName_s { @@ -1297,8 +1297,6 @@ dbgGetRuntimeOptions(void) uchar *optname; /* set some defaults */ - stddbg = 1; - if((pszOpts = (uchar*) getenv("RSYSLOG_DEBUG")) != NULL) { /* we have options set, so let's process them */ while(dbgGetRTOptNamVal(&pszOpts, &optname, &optval)) { diff --git a/runtime/debug.h b/runtime/debug.h index 717c0fef..26672c3e 100644 --- a/runtime/debug.h +++ b/runtime/debug.h @@ -35,6 +35,7 @@ /* 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 */ +extern int stddbg; /* the handle for regular debug output, set to stdout if not forking, -1 otherwise */ /* data types */ |