From 11044fe37ca36ae69112de3f8d1a9b6c48926334 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Sun, 13 Jan 2008 17:21:41 +0000 Subject: renamed $MainMsgQueuePersistUpdateCount config file directive to $MainMsgQueueCheckpointInterval --- ChangeLog | 5 +++++ doc/rsyslog_conf.html | 2 +- syslogd.c | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6058b70f..5225c6da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,13 @@ --------------------------------------------------------------------------- Version 3.10.2 (rgerhards), 2008-01-1? +- added the ability to keep stop rsyslogd without the need to drain + the main message queue. In disk queue mode, rsyslog continues to + run from the point where it stopped. In case of a system failure, it + continues to process messages from the last checkpoint. - fixed a bug that caused a segfault on startup when no $WorkDir directive was specified in rsyslog.conf - added $MainMsgQueueImmediateShutdown config directive +- added $MainMsgQueueCheckpointInterval config file directive --------------------------------------------------------------------------- Version 3.10.1 (rgerhards), 2008-01-10 - implemented the "disk" queue mode. However, it currently is of very diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html index a8eaf062..ee54c00f 100644 --- a/doc/rsyslog_conf.html +++ b/doc/rsyslog_conf.html @@ -59,11 +59,11 @@ development and quite unstable...). So you have been warned ;)

  • $klogUseSyscallInterface (imklog)  [on/off] -- former klogd -2 option
  • $klogSymbolsTwice (imklog) [on/off] -- former klogd -s option
    • +
  • $MainMsgQueueCheckpointInterval <number>
  • $MainMsgQueueFileName <name>
  • $MainMsgQueueImmediateShutdown [on/off]
  • $MainMsgQueueSize
  • $MainMsgQueueMaxFileSize <size_nbr>, default 1m
    • -
  • $MainMsgQueuePersistUpdateCount <number>
  • $MainMsgQueueType [FixedArray/LinkedList/Direct/Disk]
  • $MainMsgQueueWorkerThreads <number>, num worker threads, default 1, recommended 1
    • diff --git a/syslogd.c b/syslogd.c index c3135237..bd041ffa 100644 --- a/syslogd.c +++ b/syslogd.c @@ -3400,7 +3400,7 @@ init(void) setQPROP(queueSetMaxFileSize, "$MainMsgQueueFileSize", iMainMsgQueMaxFileSize); setQPROPstr(queueSetFilePrefix, "$MainMsgQueueFileName", (pszMainMsgQFName == NULL ? (uchar*) "mainq" : pszMainMsgQFName)); - setQPROP(queueSetiPersistUpdCnt, "$MainMsgQueuePersistUpdateCount", iMainMsgQPersistUpdCnt); + setQPROP(queueSetiPersistUpdCnt, "$MainMsgQueueCheckpointInterval", iMainMsgQPersistUpdCnt); # undef setQPROP # undef setQPROPstr @@ -4562,7 +4562,7 @@ static rsRetVal loadBuildInModules(void) CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuefilename", 0, eCmdHdlrGetWord, NULL, &pszMainMsgQFName, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuesize", 0, eCmdHdlrInt, NULL, &iMainMsgQueueSize, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueueimmediateshutdown", 0, eCmdHdlrBinary, NULL, &bMainMsgQImmediateShutdown, NULL)); - CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuepersistupdatecount", 0, eCmdHdlrInt, NULL, &iMainMsgQPersistUpdCnt, NULL)); + CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuecheckpointinterval", 0, eCmdHdlrInt, NULL, &iMainMsgQPersistUpdCnt, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuetype", 0, eCmdHdlrGetWord, setMainMsgQueType, NULL, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueueworkerthreads", 0, eCmdHdlrInt, NULL, &iMainMsgQueueNumWorkers, NULL)); CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuemaxfilesize", 0, eCmdHdlrSize, NULL, &iMainMsgQueMaxFileSize, NULL)); -- cgit v1.2.3