Merge pull request #3695 from rgerhards/queue-warning-fix

queue subsystem bugfix: oversize queue warning message shown as error

runtime/queue.c

@@ -3342,7 +3342,7 @@ qqueueApplyCnfParam(qqueue_t *pThis, struct nvlst *lst)
 		} else if(!strcmp(pblk.descr[i].name, "queue.size")) {
 			pThis->iMaxQueueSize = pvals[i].val.d.n;
 			if(pThis->iMaxQueueSize > OVERSIZE_QUEUE_WATERMARK) {
-				parser_errmsg("queue.size=%d is very large - is this "
+				parser_warnmsg("queue.size=%d is very large - is this "
 					"really intended? More info at "
 					"https://www.rsyslog.com/avoid-overly-large-in-memory-queues/",
 					pThis->iMaxQueueSize);

tests/Makefile.am

@@ -215,7 +215,7 @@ TESTS +=  \
 	tcp_forwarding_dflt_tpl.sh \
 	tcp_forwarding_retries.sh \
 	mainq_actq_DA.sh \
-	queue_errmsg-oversize.sh \
+	queue_warnmsg-oversize.sh \
 	queue-minbatch.sh \
 	queue-minbatch-queuefull.sh \
 	arrayqueue.sh \
@@ -1491,7 +1491,7 @@ EXTRA_DIST= \
 	tcp_forwarding_dflt_tpl.sh \
 	tcp_forwarding_retries.sh \
 	mainq_actq_DA.sh \
-	queue_errmsg-oversize.sh \
+	queue_warnmsg-oversize.sh \
 	queue-minbatch.sh \
 	queue-minbatch-queuefull.sh \
 	killrsyslog.sh \

tests/queue_warnmsg-oversize.sh

@@ -10,6 +10,6 @@ action(type="omfile" file="'$RSYSLOG_OUT_LOG'"
 startup
 shutdown_when_empty
 wait_shutdown
-content_check "queue.size=500001 is very large"
+content_check --regex "warning.*queue.size=500001 is very large"
 
 exit_test