summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-20 11:05:02 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-20 11:05:02 +0200
commit8e45fd5c8e7df45532c5d239676cd92107c9e942 (patch)
treed5c4a95b2a679abef30d65cfea7f33ecf698a0c5
parent73cc2afb2246a0339fdadde4f2bf66120bcae20f (diff)
downloadrsyslog-8e45fd5c8e7df45532c5d239676cd92107c9e942.tar.gz
rsyslog-8e45fd5c8e7df45532c5d239676cd92107c9e942.tar.xz
rsyslog-8e45fd5c8e7df45532c5d239676cd92107c9e942.zip
bugfix: potential hang condition on queue shutdown
-rw-r--r--ChangeLog1
-rw-r--r--runtime/wtp.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e31d56d7..a3946c2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Version 3.22.2 [v3-stable] (rgerhards), 2009-07-??
- enhance: imrelp now also provides remote peer's IP address
[if librelp != 1.0.0 is used]
- bugfix: sending syslog messages with zip compression did not work
+- bugfix: potential hang condition on queue shutdown
- clarified use of $ActionsSendStreamDriver[AuthMode/PermittedPeers]
in doc set (require TLS drivers)
---------------------------------------------------------------------------
diff --git a/runtime/wtp.c b/runtime/wtp.c
index 3beae271..fcecc4f2 100644
--- a/runtime/wtp.c
+++ b/runtime/wtp.c
@@ -171,9 +171,7 @@ wtpWakeupAllWrkr(wtp_t *pThis)
DEFiRet;
ISOBJ_TYPE_assert(pThis, wtp);
- d_pthread_mutex_lock(pThis->pmutUsr);
pthread_cond_broadcast(pThis->pcondBusy);
- d_pthread_mutex_unlock(pThis->pmutUsr);
RETiRet;
}