From 420189ba2f860fe29b75a2c8e426d7ca9b1ffaf7 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 27 Apr 2012 12:32:57 +0200
Subject: bugfix: active input in "light delay state" could block rsyslog
 termination

at least for prolonged period of time...
---
 runtime/queue.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'runtime/queue.c')

diff --git a/runtime/queue.c b/runtime/queue.c
index 9f318523..5e000cd2 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -2247,6 +2247,10 @@ doEnqSingleObj(qqueue_t *pThis, flowControl_t flowCtlType, void *pUsr)
 	DEFiRet;
 	struct timespec t;
 
+	if(glbl.GetGlobalInputTermState()) {
+		ABORT_FINALIZE(RS_RET_FORCE_TERM);
+	}
+
 	STATSCOUNTER_INC(pThis->ctrEnqueued, pThis->mutCtrEnqueued);
 	/* first check if we need to discard this message (which will cause CHKiRet() to exit)
 	 */
-- 
cgit v1.2.3