diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-13 15:02:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-08-13 15:02:50 +0200 |
| commit | 1a7bf0ceaa792c580a726db831c749b80376e243 (patch) | |
| tree | 222e63ba69d6bc3b3e53713c6f19b259e0d01360 /tools | |
| parent | d7bc0f1f1e81ca0fa678b945962574112df949bc (diff) | |
| parent | a61e548958044f9efa013b5911d130ae1930448f (diff) | |
| download | rsyslog-1a7bf0ceaa792c580a726db831c749b80376e243.tar.gz rsyslog-1a7bf0ceaa792c580a726db831c749b80376e243.tar.xz rsyslog-1a7bf0ceaa792c580a726db831c749b80376e243.zip | |
Merge branch 'beta'
Conflicts:
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 ad28ff22..758d5ed1 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2698,7 +2698,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)); |