Merge branch 'v5-stable' into v5-beta

Conflicts:
	runtime/ruleset.c

1 files changed, 59 insertions, 4 deletions

diff --git a/tools/syslogd.c b/tools/syslogd.c
index 63fffbfa..75ee96eb 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -230,6 +230,11 @@ typedef struct legacyOptsLL_s {
 } legacyOptsLL_t;
 legacyOptsLL_t *pLegacyOptsLL = NULL;
 
+struct queuefilenames_s {
+	struct queuefilenames_s *next;
+	uchar *name;
+} *queuefilenames = NULL;
+
 /* global variables for config file state */
 int	iCompatibilityMode = 0;		/* version we should be compatible with; 0 means sysklogd. It is
 					   the default, so if no -c<n> option is given, we make ourselvs
@@ -736,11 +741,19 @@ submitMsg(msg_t *pMsg)
 	ISOBJ_TYPE_assert(pMsg, msg);
 
 	pRuleset = MsgGetRuleset(pMsg);
-
 	pQueue = (pRuleset == NULL) ? pMsgQueue : ruleset.GetRulesetQueue(pRuleset);
+
+	/* if a plugin logs a message during shutdown, the queue may no longer exist */
+	if(pQueue == NULL) {
+		DBGPRINTF("submitMsg() could not submit message - "
+			  "queue does (no longer?) exist - ignored\n");
+		FINALIZE;
+	}
+
 	MsgPrepareEnqueue(pMsg);
 	qqueueEnqObj(pQueue, pMsg->flowCtlType, (void*) pMsg);
 
+finalize_it:
 	RETiRet;
 }
 
@@ -761,12 +774,20 @@ multiSubmitMsg(multi_submit_t *pMultiSub)
 	if(pMultiSub->nElem == 0)
 		FINALIZE;
 
+	pRuleset = MsgGetRuleset(pMultiSub->ppMsgs[0]);
+	pQueue = (pRuleset == NULL) ? pMsgQueue : ruleset.GetRulesetQueue(pRuleset);
+
+	/* if a plugin logs a message during shutdown, the queue may no longer exist */
+	if(pQueue == NULL) {
+		DBGPRINTF("multiSubmitMsg() could not submit message - "
+			  "queue does (no longer?) exist - ignored\n");
+		FINALIZE;
+	}
+
 	for(i = 0 ; i < pMultiSub->nElem ; ++i) {
 		MsgPrepareEnqueue(pMultiSub->ppMsgs[i]);
 	}
 
-	pRuleset = MsgGetRuleset(pMultiSub->ppMsgs[0]);
-	pQueue = (pRuleset == NULL) ? pMsgQueue : ruleset.GetRulesetQueue(pRuleset);
 	iRet = pQueue->MultiEnq(pQueue, pMultiSub);
 	pMultiSub->nElem = 0;
 
@@ -1026,6 +1047,14 @@ static void doDie(int sig)
 static void
 freeAllDynMemForTermination(void)
 {
+	struct queuefilenames_s *qfn, *qfnDel;
+
+	for(qfn = queuefilenames ; qfn != NULL ; ) {
+		qfnDel = qfn;
+		qfn = qfn->next;
+		free(qfnDel->name);
+		free(qfnDel);
+	}
 	free(pszMainMsgQFName);
 	free(pModDir);
 	free(pszConfDAGFile);
@@ -1552,6 +1581,10 @@ startInputModules(void)
  */
 rsRetVal createMainQueue(qqueue_t **ppQueue, uchar *pszQueueName)
 {
+	struct queuefilenames_s *qfn;
+	uchar *qfname = NULL;
+	static int qfn_renamenum = 0;
+	uchar qfrenamebuf[1024];
 	DEFiRet;
 
 	/* switch the message object to threaded operation, if necessary */
@@ -1577,10 +1610,32 @@ rsRetVal createMainQueue(qqueue_t **ppQueue, uchar *pszQueueName)
 		errmsg.LogError(0, NO_ERRCODE, "Invalid " #directive ", error %d. Ignored, running with default setting", iRet); \
 	}
 
+	if(pszMainMsgQFName != NULL) {
+		/* check if the queue file name is unique, else emit an error */
+		for(qfn = queuefilenames ; qfn != NULL ; qfn = qfn->next) {
+			dbgprintf("check queue file name '%s' vs '%s'\n", qfn->name, pszMainMsgQFName);
+			if(!ustrcmp(qfn->name, pszMainMsgQFName)) {
+				snprintf((char*)qfrenamebuf, sizeof(qfrenamebuf), "%d-%s-%s",
+					 ++qfn_renamenum, pszMainMsgQFName, 
+					 (pszQueueName == NULL) ? "NONAME" : (char*)pszQueueName);
+				qfname = ustrdup(qfrenamebuf);
+				errmsg.LogError(0, NO_ERRCODE, "Error: queue file name '%s' already in use "
+					" - using '%s' instead", pszMainMsgQFName, qfname);
+				break;
+			}
+		}
+		if(qfname == NULL)
+			qfname = ustrdup(pszMainMsgQFName);
+		qfn = malloc(sizeof(struct queuefilenames_s));
+		qfn->name = qfname;
+		qfn->next = queuefilenames;
+		queuefilenames = qfn;
+	}
+
 	setQPROP(qqueueSetMaxFileSize, "$MainMsgQueueFileSize", iMainMsgQueMaxFileSize);
 	setQPROP(qqueueSetsizeOnDiskMax, "$MainMsgQueueMaxDiskSpace", iMainMsgQueMaxDiskSpace);
 	setQPROP(qqueueSetiDeqBatchSize, "$MainMsgQueueDequeueBatchSize", iMainMsgQueDeqBatchSize);
-	setQPROPstr(qqueueSetFilePrefix, "$MainMsgQueueFileName", pszMainMsgQFName);
+	setQPROPstr(qqueueSetFilePrefix, "$MainMsgQueueFileName", qfname);
 	setQPROP(qqueueSetiPersistUpdCnt, "$MainMsgQueueCheckpointInterval", iMainMsgQPersistUpdCnt);
 	setQPROP(qqueueSetbSyncQueueFiles, "$MainMsgQueueSyncQueueFiles", bMainMsgQSyncQeueFiles);
 	setQPROP(qqueueSettoQShutdown, "$MainMsgQueueTimeoutShutdown", iMainMsgQtoQShutdown );