Fix a deadlock in ApiClient::~ApiClient

fixes #8462

diff --git a/lib/remote/apiclient.cpp b/lib/remote/apiclient.cpp
index dfef74c4f94ca0f974096a0b5235198267a2458c..dd0a4dfe8adedf0954297184fc7787bb1a3b76b2 100644 (file)
--- a/lib/remote/apiclient.cpp
+++ b/lib/remote/apiclient.cpp
@@ -74,13 +74,6 @@ ConnectionRole ApiClient::GetRole(void) const
 
 void ApiClient::SendMessage(const Dictionary::Ptr& message)
 {
-       if (m_WriteQueue.GetLength() > 20000) {
-               Log(LogWarning, "remote")
-                   << "Closing connection for API identity '" << m_Identity << "': Too many queued messages.";
-               Disconnect();
-               return;
-       }
-
        m_WriteQueue.Enqueue(boost::bind(&ApiClient::SendMessageSync, ApiClient::Ptr(this), message));
 }
 
@@ -106,11 +99,6 @@ void ApiClient::SendMessageSync(const Dictionary::Ptr& message)
 }
 
 void ApiClient::Disconnect(void)
-{
-       Utility::QueueAsyncCallback(boost::bind(&ApiClient::DisconnectSync, ApiClient::Ptr(this)));
-}
-
-void ApiClient::DisconnectSync(void)
 {
        Log(LogWarning, "ApiClient")
            << "API client disconnected for identity '" << m_Identity << "'";
@@ -127,6 +115,8 @@ void ApiClient::DisconnectSync(void)
        } catch (const std::exception&) {
                /* Ignore the exception. */
        }
+
+       m_WriteQueue.Join();
 }
 
 bool ApiClient::ProcessMessage(void)

diff --git a/lib/remote/apiclient.hpp b/lib/remote/apiclient.hpp
index b0de343ae62f22919bd30aeb664658d77206d305..de0b3eee59945d9686044d96af04f38c3064b2f3 100644 (file)
--- a/lib/remote/apiclient.hpp
+++ b/lib/remote/apiclient.hpp
@@ -58,7 +58,6 @@ public:
        ConnectionRole GetRole(void) const;
 
        void Disconnect(void);
-       void DisconnectSync(void);
 
        void SendMessage(const Dictionary::Ptr& request);