]> granicus.if.org Git - icinga2/commitdiff
Remove JsonRpcConnection::m_WriteQueue
authorGunnar Beutner <gunnar@beutner.name>
Wed, 30 Sep 2015 14:38:56 +0000 (16:38 +0200)
committerGunnar Beutner <gunnar@beutner.name>
Wed, 30 Sep 2015 14:39:36 +0000 (16:39 +0200)
refs #9976

lib/remote/jsonrpcconnection.cpp
lib/remote/jsonrpcconnection.hpp

index ed506511360831fdc2c503ecdda78d755a9a5374..19471d10c8edf8e16ecd26f51fc9554b287375ca 100644 (file)
@@ -91,12 +91,6 @@ ConnectionRole JsonRpcConnection::GetRole(void) const
 }
 
 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 {
                ObjectLock olock(m_Stream);
@@ -120,8 +114,6 @@ void JsonRpcConnection::Disconnect(void)
 
        m_Stream->Close();
 
-       m_WriteQueue.Join();
-
        if (m_Endpoint)
                m_Endpoint->RemoveClient(this);
        else {
index 42b0aee5db7ca37a9e59f2bdf93a78bb8879b1bb..6017e32b0051e2bbc063d1fb8fddd64726a6d1b0 100644 (file)
@@ -83,11 +83,8 @@ private:
 
        StreamReadContext m_Context;
 
-       WorkQueue m_WriteQueue;
-
        bool ProcessMessage(void);
        void DataAvailableHandler(void);
-       void SendMessageSync(const Dictionary::Ptr& request);
 
        static void StaticInitialize(void);
        static void TimeoutTimerHandler(void);