tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock in ApiListener::RelayMessage 

fixes #10002
This commit is contained in:
Gunnar Beutner 2015-09-02 07:39:40 +02:00 committed by Michael Friedrich
parent e480af3c7f
commit c8d24b6d49
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/remote/apiclient.cpp
View File

@ -90,7 +90,7 @@ ConnectionRole ApiClient::GetRole(void) const
void ApiClient::SendMessage(const Dictionary::Ptr& message) void ApiClient::SendMessage(const Dictionary::Ptr& message)
{ {
m_WriteQueue.Enqueue(boost::bind(&ApiClient::SendMessageSync, ApiClient::Ptr(this), message)); m_WriteQueue.Enqueue(boost::bind(&ApiClient::SendMessageSync, ApiClient::Ptr(this), message), true);
} }
void ApiClient::SendMessageSync(const Dictionary::Ptr& message) void ApiClient::SendMessageSync(const Dictionary::Ptr& message)

2
lib/remote/apilistener.cpp
View File

@ -456,7 +456,7 @@ void ApiListener::ApiTimerHandler(void)
void ApiListener::RelayMessage(const MessageOrigin& origin, const DynamicObject::Ptr& secobj, const Dictionary::Ptr& message, bool log) void ApiListener::RelayMessage(const MessageOrigin& origin, const DynamicObject::Ptr& secobj, const Dictionary::Ptr& message, bool log)
{ {
m_RelayQueue.Enqueue(boost::bind(&ApiListener::SyncRelayMessage, this, origin, secobj, message, log)); m_RelayQueue.Enqueue(boost::bind(&ApiListener::SyncRelayMessage, this, origin, secobj, message, log), true);
} }
void ApiListener::PersistMessage(const Dictionary::Ptr& message, const DynamicObject::Ptr& secobj) void ApiListener::PersistMessage(const Dictionary::Ptr& message, const DynamicObject::Ptr& secobj)