diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-13 15:01:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-13 15:01:43 +0200 |
| commit | a61e548958044f9efa013b5911d130ae1930448f (patch) | |
| tree | ffffceade2526bfdfc43c920b0311afb7b242b56 /tools | |
| parent | 66300192944fe2c4390e53549ed51b4b25e79524 (diff) | |
| parent | 8eb888d049da12e1294a7688432b6325794ade32 (diff) | |
| download | rsyslog-a61e548958044f9efa013b5911d130ae1930448f.tar.gz rsyslog-a61e548958044f9efa013b5911d130ae1930448f.tar.bz2 rsyslog-a61e548958044f9efa013b5911d130ae1930448f.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imuxsock/imuxsock.c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 5edf92ce..e432a67d 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2652,7 +2652,7 @@ static rsRetVal loadBuildInModules(void) CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuetimeoutshutdown", 0, eCmdHdlrInt, NULL, &iMainMsgQtoQShutdown, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuetimeoutactioncompletion", 0, eCmdHdlrInt, NULL, &iMainMsgQtoActShutdown, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuetimeoutenqueue", 0, eCmdHdlrInt, NULL, &iMainMsgQtoEnq, NULL)); - CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueueworketimeoutrthreadshutdown", 0, eCmdHdlrInt, NULL, &iMainMsgQtoWrkShutdown, NULL)); + CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueueworkertimeoutthreadshutdown", 0, eCmdHdlrInt, NULL, &iMainMsgQtoWrkShutdown, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuedequeueslowdown", 0, eCmdHdlrInt, NULL, &iMainMsgQDeqSlowdown, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueueworkerthreadminimummessages", 0, eCmdHdlrInt, NULL, &iMainMsgQWrkMinMsgs, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuemaxfilesize", 0, eCmdHdlrSize, NULL, &iMainMsgQueMaxFileSize, NULL)); |