From 166acbfeca3011ab51bb4a1d3a6e36e1d44af71a Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 6 Jun 2019 14:07:06 +0200 Subject: [PATCH] queue subsystem bugfix: oversize queue warning message shown as error The warning message was emitted as an error message, which is misleading and may also break some automatted procedures. --- runtime/queue.c | 2 +- tests/Makefile.am | 4 ++-- tests/{queue_errmsg-oversize.sh => queue_warnmsg-oversize.sh} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename tests/{queue_errmsg-oversize.sh => queue_warnmsg-oversize.sh} (81%) diff --git a/runtime/queue.c b/runtime/queue.c index 1be045358..23de36623 100644 --- a/runtime/queue.c +++ b/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); diff --git a/tests/Makefile.am b/tests/Makefile.am index ac1e1caba..b5bba1dd8 100644 --- a/tests/Makefile.am +++ b/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 \ diff --git a/tests/queue_errmsg-oversize.sh b/tests/queue_warnmsg-oversize.sh similarity index 81% rename from tests/queue_errmsg-oversize.sh rename to tests/queue_warnmsg-oversize.sh index a5dca5a0b..b3803e85c 100755 --- a/tests/queue_errmsg-oversize.sh +++ b/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