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

Remove JsonRpcConnection::m_WriteQueue 

refs #9976
This commit is contained in:
Gunnar Beutner 2015-09-30 16:38:56 +02:00
parent 0529d51a85
commit c1892a2f30
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/remote/jsonrpcconnection.cpp
View File

@ -91,12 +91,6 @@ ConnectionRole JsonRpcConnection::GetRole(void) const
} }
void JsonRpcConnection::SendMessage(const Dictionary::Ptr& message) void JsonRpcConnection::SendMessage(const Dictionary::Ptr& message)
{
if (!m_Stream->IsEof())
m_WriteQueue.Enqueue(boost::bind(&JsonRpcConnection::SendMessageSync, JsonRpcConnection::Ptr(this), message), true);
}
void JsonRpcConnection::SendMessageSync(const Dictionary::Ptr& message)
{ {
try { try {
ObjectLock olock(m_Stream); ObjectLock olock(m_Stream);
@ -120,8 +114,6 @@ void JsonRpcConnection::Disconnect(void)
m_Stream->Close(); m_Stream->Close();
m_WriteQueue.Join();
if (m_Endpoint) if (m_Endpoint)
m_Endpoint->RemoveClient(this); m_Endpoint->RemoveClient(this);
else { else {

3
lib/remote/jsonrpcconnection.hpp
View File

@ -83,11 +83,8 @@ private:
StreamReadContext m_Context; StreamReadContext m_Context;
WorkQueue m_WriteQueue;
bool ProcessMessage(void); bool ProcessMessage(void);
void DataAvailableHandler(void); void DataAvailableHandler(void);
void SendMessageSync(const Dictionary::Ptr& request);
static void StaticInitialize(void); static void StaticInitialize(void);
static void TimeoutTimerHandler(void); static void TimeoutTimerHandler(void);