bugfix[minor]: light delay queue mark not properly handled

if queue size reached light_delay mark, enqueuing
could potentially be blocked for a longer period of time, which
was not the behaviour desired.

2 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index befba912..9a457547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@ Version 3.18.5 (rgerhards), 2008-10-??
   because getnameinfo() is not cancel-safe, but was not guarded against
   being cancelled. pthread_cancel() is routinely being called during
   HUP processing.
+- bugfix[minor]: if queue size reached light_delay mark, enqueuing
+  could potentially be blocked for a longer period of time, which
+  was not the behaviour desired.
 - doc bugfix: $ActionExecOnlyWhenPreviousIsSuspended was still misspelled
   as $...OnlyIfPrev... in some parts of the documentation. Thanks to 
   Lorenzo M. Catucci for reporting this bug.
diff --git a/queue.c b/queue.c
index 081f48b3..37782cf0 100644
--- a/queue.c
+++ b/queue.c
@@ -2142,7 +2142,7 @@ queueEnqObj(queue_t *pThis, flowControl_t flowCtlType, void *pUsr)
 			pthread_cond_wait(&pThis->belowFullDlyWtrMrk, pThis->mut); /* TODO error check? But what do then? */
 		}
 	} else if(flowCtlType == eFLOWCTL_LIGHT_DELAY) {
-		while(pThis->iQueueSize >= pThis->iLightDlyMrk) {
+		if(pThis->iQueueSize >= pThis->iLightDlyMrk) {
 			dbgoprint((obj_t*) pThis, "enqueueMsg: LightDelay mark reached for light delayble message - blocking a bit.\n");
 			timeoutComp(&t, 1000); /* 1000 millisconds = 1 second TODO: make configurable */
 			pthread_cond_timedwait(&pThis->belowLightDlyWtrMrk, pThis->mut, &t); /* TODO error check? But what do then? */