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
parent da83bae660
commit 5c77e6eafe
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/apilistener.cpp
View File

@ -510,7 +510,7 @@ void ApiListener::ApiTimerHandler(void)
void ApiListener::RelayMessage(const MessageOrigin::Ptr& origin, const ConfigObject::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 ConfigObject::Ptr& secobj)

2
lib/remote/jsonrpcconnection.cpp
View File

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