summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-02-11 17:47:30 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-02-11 17:47:30 +0100
commitf3d354da3e373f9c4890a78e5274a6ba02f1c8cb (patch)
tree9fd7c964af36dfa1802bf08173fefca2a9453a4e /runtime
parent6a18d25cbec2676a7910ff038170716293abe89f (diff)
downloadrsyslog-f3d354da3e373f9c4890a78e5274a6ba02f1c8cb.tar.gz
rsyslog-f3d354da3e373f9c4890a78e5274a6ba02f1c8cb.tar.xz
rsyslog-f3d354da3e373f9c4890a78e5274a6ba02f1c8cb.zip
bugfix: very long running actions could prevent shutdown under some circumstances
This has now been solved, at least for common situations.
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 9f63a338..76327f6a 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -1497,7 +1497,7 @@ DequeueConsumable(qqueue_t *pThis, wti_t *pWti)
* now that we dequeue batches of pointers, this is much less an issue...
* rgerhards, 2009-04-22
*/
- if(iQueueSize < pThis->iFullDlyMrk / 2) {
+ if(iQueueSize < pThis->iFullDlyMrk / 2 || glbl.GetGlobalInputTermState() == 1) {
pthread_cond_broadcast(&pThis->belowFullDlyWtrMrk);
}