summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-09-18 12:44:00 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-09-18 12:44:00 +0200
commit7b63cd6feda5087c43652bdcf8e694b544295d5b (patch)
treea51dd63c9b182a05848e35023f43d8807344113f /tools
parentebc931db47bf1e28502a043dc2984acf5fd532b6 (diff)
downloadrsyslog-7b63cd6feda5087c43652bdcf8e694b544295d5b.tar.gz
rsyslog-7b63cd6feda5087c43652bdcf8e694b544295d5b.tar.xz
rsyslog-7b63cd6feda5087c43652bdcf8e694b544295d5b.zip
minor things, mostly improved debug info
Diffstat (limited to 'tools')
-rw-r--r--tools/syslogd.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c
index b6e1d826..90b38748 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -1928,7 +1928,7 @@ die(int sig)
/* close the inputs */
dbgprintf("Terminating input threads...\n");
- thrdTerminateAll(); /* TODO: inputs only, please */
+ thrdTerminateAll();
/* and THEN send the termination log message (see long comment above) */
if (sig) {
@@ -2168,8 +2168,8 @@ static void dbgPrintInitInfo(void)
cCCEscapeChar);
dbgprintf("Main queue size %d messages.\n", iMainMsgQueueSize);
- dbgprintf("Main queue worker threads: %d, Perists every %d updates.\n",
- iMainMsgQueueNumWorkers, iMainMsgQPersistUpdCnt);
+ dbgprintf("Main queue worker threads: %d, wThread shutdown: %d, Perists every %d updates.\n",
+ iMainMsgQueueNumWorkers, iMainMsgQtoWrkShutdown, iMainMsgQPersistUpdCnt);
dbgprintf("Main queue timeouts: shutdown: %d, action completion shutdown: %d, enq: %d\n",
iMainMsgQtoQShutdown, iMainMsgQtoActShutdown, iMainMsgQtoEnq);
dbgprintf("Main queue watermarks: high: %d, low: %d, discard: %d, discard-severity: %d\n",
@@ -2179,11 +2179,9 @@ static void dbgPrintInitInfo(void)
/* TODO: add
iActionRetryCount = 0;
iActionRetryInterval = 30000;
- static int iMainMsgQtoWrkShutdown = 60000;
static int iMainMsgQtoWrkMinMsgs = 100;
static int iMainMsgQbSaveOnShutdown = 1;
iMainMsgQueMaxDiskSpace = 0;
- setQPROP(queueSettoWrkShutdown, "$MainMsgQueueTimeoutWorkerThreadShutdown", 5000);
setQPROP(queueSetiMinMsgsPerWrkr, "$MainMsgQueueWorkerThreadMinimumMessages", 100);
setQPROP(queueSetbSaveOnShutdown, "$MainMsgQueueSaveOnShutdown", 1);
*/