3 files changed, 50 insertions, 4 deletions

diff --git a/runtime/glbl.c b/runtime/glbl.c
index ccb978ba..6af38e01 100644
--- a/runtime/glbl.c
+++ b/runtime/glbl.c
@@ -60,6 +60,7 @@ DEFobjCurrIf(net)
  * For this object, these variables are obviously what makes the "meat" of the
  * class...
  */
+static struct cnfobj *mainqCnfObj = NULL;/* main queue object, to be used later in startup sequence */
 static uchar *pszWorkDir = NULL;
 static int bOptimizeUniProc = 1;	/* enable uniprocessor optimizations */
 static int bParseHOSTNAMEandTAG = 1;	/* parser modification (based on startup params!) */
@@ -137,6 +138,7 @@ static dataType Get##nameFunc(void) \
 SIMP_PROP(ParseHOSTNAMEandTAG, bParseHOSTNAMEandTAG, int)
 SIMP_PROP(OptimizeUniProc, bOptimizeUniProc, int)
 SIMP_PROP(PreserveFQDN, bPreserveFQDN, int)
+SIMP_PROP(mainqCnfObj, mainqCnfObj, struct cnfobj *)
 SIMP_PROP(MaxLine, iMaxLine, int)
 SIMP_PROP(DefPFFamily, iDefPFFamily, int) /* note that in the future we may check the family argument */
 SIMP_PROP(DropMalPTRMsgs, bDropMalPTRMsgs, int)
@@ -529,6 +531,7 @@ CODESTARTobjQueryInterface(glbl)
 	SIMP_PROP(DropMalPTRMsgs);
 	SIMP_PROP(Option_DisallowWarning);
 	SIMP_PROP(DisableDNS);
+	SIMP_PROP(mainqCnfObj);
 	SIMP_PROP(LocalFQDNName)
 	SIMP_PROP(LocalHostName)
 	SIMP_PROP(LocalDomain)
@@ -579,6 +582,8 @@ static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __a
 void
 glblPrepCnf(void)
 {
+	free(mainqCnfObj);
+	mainqCnfObj = NULL;
 	free(cnfparamvals);
 	cnfparamvals = NULL;
 }
@@ -596,6 +601,31 @@ glblProcessCnf(struct cnfobj *o)
 	cnfparamsPrint(&paramblk, cnfparamvals);
 }
 
+/* Set mainq parameters. Note that when this is not called, we'll use the
+ * legacy parameter config. mainq parameters can only be set once.
+ */
+void
+glblProcessMainQCnf(struct cnfobj *o)
+{
+	if(mainqCnfObj == NULL) {
+		mainqCnfObj = o;
+	} else {
+		errmsg.LogError(0, RS_RET_ERR, "main_queue() object can only be specified "
+				"once - all but first ignored\n");
+	}
+}
+
+/* destruct the main q cnf object after it is no longer needed. This is
+ * also used to do some final checks.
+ */
+void
+glblDestructMainqCnfObj()
+{
+	nvlstChkUnused(mainqCnfObj->nvlst);
+	cnfobjDestruct(mainqCnfObj);
+	mainqCnfObj = NULL;
+}
+
 void
 glblDoneLoadCnf(void)
 {
diff --git a/runtime/glbl.h b/runtime/glbl.h
index 2c7f3b31..4b1cd9f8 100644
--- a/runtime/glbl.h
+++ b/runtime/glbl.h
@@ -52,6 +52,7 @@ BEGINinterface(glbl) /* name must also be changed in ENDinterface macro! */
 	SIMP_PROP(Option_DisallowWarning, int)
 	SIMP_PROP(DisableDNS, int)
 	SIMP_PROP(LocalFQDNName, uchar*)
+	SIMP_PROP(mainqCnfObj, struct cnfobj*)
 	SIMP_PROP(LocalHostName, uchar*)
 	SIMP_PROP(LocalDomain, uchar*)
 	SIMP_PROP(StripDomains, char**)
@@ -96,6 +97,8 @@ static inline void glblSetOurPid(pid_t pid) { glbl_ourpid = pid; }
 
 void glblPrepCnf(void);
 void glblProcessCnf(struct cnfobj *o);
+void glblProcessMainQCnf(struct cnfobj *o);
+void glblDestructMainqCnfObj();
 void glblDoneLoadCnf(void);
 
 #endif /* #ifndef GLBL_H_INCLUDED */
diff --git a/runtime/rsconf.c b/runtime/rsconf.c
index d8b81f1b..b13e5cc7 100644
--- a/runtime/rsconf.c
+++ b/runtime/rsconf.c
@@ -399,6 +399,7 @@ yyerror(char *s)
 }
 void cnfDoObj(struct cnfobj *o)
 {
+	int bDestructObj = 1;
 	int bChkUnuse = 1;
 
 	dbgprintf("cnf:global:obj: ");
@@ -407,6 +408,10 @@ void cnfDoObj(struct cnfobj *o)
 	case CNFOBJ_GLOBAL:
 		glblProcessCnf(o);
 		break;
+	case CNFOBJ_MAINQ:
+		glblProcessMainQCnf(o);
+		bDestructObj = 0;
+		break;
 	case CNFOBJ_MODULE:
 		modulesProcessCnf(o);
 		break;
@@ -430,9 +435,11 @@ void cnfDoObj(struct cnfobj *o)
 			 o->objType);
 		break;
 	}
-	if(bChkUnuse)
-		nvlstChkUnused(o->nvlst);
-	cnfobjDestruct(o);
+	if(bDestructObj) {
+		if(bChkUnuse)
+			nvlstChkUnused(o->nvlst);
+		cnfobjDestruct(o);
+	 }
 }
 
 void cnfDoScript(struct cnfstmt *script)
@@ -757,9 +764,14 @@ startInputModules(void)
 static inline rsRetVal
 activateMainQueue()
 {
+	struct cnfobj *mainqCnfObj;
 	DEFiRet;
+
+	mainqCnfObj = glbl.GetmainqCnfObj();
+	DBGPRINTF("activateMainQueue: mainq cnf obj ptr is %p\n", mainqCnfObj);
 	/* create message queue */
-	CHKiRet_Hdlr(createMainQueue(&pMsgQueue, UCHAR_CONSTANT("main Q"), NULL)) {
+	CHKiRet_Hdlr(createMainQueue(&pMsgQueue, UCHAR_CONSTANT("main Q"),
+		    		(mainqCnfObj == NULL) ? NULL : mainqCnfObj->nvlst)) {
 		/* no queue is fatal, we need to give up in that case... */
 		fprintf(stderr, "fatal error %d: could not create message queue - rsyslogd can not run!\n", iRet);
 		FINALIZE;
@@ -768,6 +780,7 @@ activateMainQueue()
 	bHaveMainQueue = (ourConf->globals.mainQ.MainMsgQueType == QUEUETYPE_DIRECT) ? 0 : 1;
 	DBGPRINTF("Main processing queue is initialized and running\n");
 finalize_it:
+	glblDestructMainqCnfObj();
 	RETiRet;
 }