summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-10-09 13:00:36 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-10-09 13:00:36 +0200
commit25b0036fcb6ea54251fcb82e245366bbbaa71e58 (patch)
tree0066a559a4f2fc1ef25425a7fe9ebd0d775d6da8 /runtime
parent39000a62024510cd62607200e6100e3cd7c05005 (diff)
parentd5a3d4b3a7151906a4eec59ec20fc7c90cefde8c (diff)
downloadrsyslog-25b0036fcb6ea54251fcb82e245366bbbaa71e58.tar.gz
rsyslog-25b0036fcb6ea54251fcb82e245366bbbaa71e58.tar.xz
rsyslog-25b0036fcb6ea54251fcb82e245366bbbaa71e58.zip
Merge branch 'beta'
Diffstat (limited to 'runtime')
-rw-r--r--runtime/queue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/queue.c b/runtime/queue.c
index 76c2f10f..9dd92019 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -2145,7 +2145,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? */