diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-29 11:36:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-29 11:36:13 +0200 |
| commit | 6bc629021eb008e1d48627bdac70b1c8b237937b (patch) | |
| tree | ba46a74eeb318ea266061bdbcd382f9752453931 /runtime/debug.c | |
| parent | 5fa3c34a1fe0144a2d8cb74cb82a73d8c61d435d (diff) | |
| parent | f4ec11fa779e7348f68ece1b3b50d499a0526ace (diff) | |
| download | rsyslog-6bc629021eb008e1d48627bdac70b1c8b237937b.tar.gz rsyslog-6bc629021eb008e1d48627bdac70b1c8b237937b.tar.xz rsyslog-6bc629021eb008e1d48627bdac70b1c8b237937b.zip | |
Merge branch 'v5-beta' into beta
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/debug.c')
| -rw-r--r-- | runtime/debug.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/debug.c b/runtime/debug.c index 955076e2..edc4a255 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 { @@ -1303,8 +1303,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)) { |