diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-18 12:31:20 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-03-18 12:31:20 +0100 |
| commit | dac7e3d39b7d2dfe5c3fddf38275b2ca49d5396e (patch) | |
| tree | cb10a26f7025e989cd3a01bb9df829763d5c6c4d /runtime | |
| parent | 4dce63486fbb197522e11c5644cdf7aef5d7bbbc (diff) | |
| parent | ff261830c65f7d094584dba1f9bce669bd6748d4 (diff) | |
| download | rsyslog-dac7e3d39b7d2dfe5c3fddf38275b2ca49d5396e.tar.gz rsyslog-dac7e3d39b7d2dfe5c3fddf38275b2ca49d5396e.tar.bz2 rsyslog-dac7e3d39b7d2dfe5c3fddf38275b2ca49d5396e.zip | |
Merge branch 'v7-stable'
Conflicts:
runtime/debug.h
tools/syslogd.c
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/debug.c | 9 | ||||
| -rw-r--r-- | runtime/debug.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/runtime/debug.c b/runtime/debug.c index 1f22d34e..3cb22232 100644 --- a/runtime/debug.c +++ b/runtime/debug.c @@ -1315,6 +1315,15 @@ dbgmalloc(size_t size) } +/* report fd used for debug log. This is needed in case of + * auto-backgrounding, where the debug log shall not be closed. + */ +int +dbgGetDbglogFd(void) +{ + return altdbg; +} + /* read in the runtime options * rgerhards, 2008-02-28 */ diff --git a/runtime/debug.h b/runtime/debug.h index d8585fee..f3226098 100644 --- a/runtime/debug.h +++ b/runtime/debug.h @@ -107,6 +107,7 @@ void dbgSetThrdName(uchar *pszName); void dbgPrintAllDebugInfo(void); void *dbgmalloc(size_t size); void dbgOutputTID(char* name); +int dbgGetDbglogFd(void); /* macros */ #ifdef DEBUGLESS |