From 28c44e9a7bf4f99279af94a96bac42d0379b27d0 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 10 Jan 2008 14:27:26 +0000
Subject: - fixed a bug that caused a segfault on startup when no $WorkDir
 directive     was specified in rsyslog.conf - fixed a bug that caused a
 segfault on queues with types other than "disk" - removed the now longer
 needed thread TermSyncTool

---
 syslogd.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'syslogd.c')

diff --git a/syslogd.c b/syslogd.c
index d949b72b..e1fcb056 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -3244,7 +3244,7 @@ startInputModules(void)
 	while(pMod != NULL) {
 		if((iRet = pMod->mod.im.willRun()) == RS_RET_OK) {
 			/* activate here */
-			thrdCreate(pMod->mod.im.runInput, pMod->mod.im.eTermSyncType, pMod->mod.im.afterRun);
+			thrdCreate(pMod->mod.im.runInput, pMod->mod.im.afterRun);
 		} else {
 			dbgprintf("module %lx will not run, iRet %d\n", (unsigned long) pMod, iRet);
 		}
@@ -3349,6 +3349,12 @@ init(void)
 		iMainMsgQueueNumWorkers = 1;
 	}
 
+	if(MainMsgQueType == QUEUETYPE_DISK && pszWorkDir == NULL) {
+		fprintf(stderr, "No $WorkDirectory specified - can not run main message queue in 'disk' mode. "
+			        "Using 'FixedArray' instead.\n");
+		MainMsgQueType = QUEUETYPE_FIXED_ARRAY;
+	}
+
 	/* switch the message object to threaded operation, if necessary */
 	if(MainMsgQueType == QUEUETYPE_DIRECT || iMainMsgQueueNumWorkers > 1) {
 		MsgEnableThreadSafety();
@@ -3360,6 +3366,7 @@ init(void)
 		fprintf(stderr, "fatal error %d: could not create message queue - rsyslogd can not run!\n", iRet);
 		exit(1);
 	}
+dbgprintf("queue 1 \n");
 	/* ... set some properties ... */
 #	define setQPROP(func, directive, data) \
 	CHKiRet_Hdlr(func(pMsgQueue, data)) { \
@@ -3371,18 +3378,21 @@ init(void)
 	}
 
 	setQPROP(queueSetMaxFileSize, "$MainMsgQueueFileSize", iMainMsgQueMaxFileSize);
-	setQPROPstr(queueSetFilePrefix, "$MainMsgQueueFilePrefix",
+dbgprintf("queue 2 \n");
+	setQPROPstr(queueSetFilePrefix, "$MainMsgQueueFileName",
 		    (pszMainMsgQFName == NULL ? (uchar*) "mainq" : pszMainMsgQFName));
 
 #	undef setQPROP
 #	undef setQPROPstr
 
+dbgprintf("try start queue \n");
 	/* ... and finally start the queue! */
 	CHKiRet_Hdlr(queueStart(pMsgQueue)) {
 		/* no queue is fatal, we need to give up in that case... */
 		fprintf(stderr, "fatal error %d: could not start message queue - rsyslogd can not run!\n", iRet);
 		exit(1);
 	}
+dbgprintf("queue running\n");
 
 	Initialized = 1;
 	bHaveMainQueue = (MainMsgQueType == QUEUETYPE_DIRECT) ? 0 : 1;
@@ -3395,6 +3405,7 @@ init(void)
 	 */
 	startInputModules();
 
+dbgprintf("inputs running\n");
 	if(Debug) {
 		dbgPrintInitInfo();
 	}
-- 
cgit v1.2.3