cluster: Fix deadlock when reconnecting.

diff --git a/components/cluster/clustercomponent.cpp b/components/cluster/clustercomponent.cpp
index 013bff4cd196715e72fa53d8d9473e196060b5bb..b4821bb0d8525850d4bea8e2a8340c6cbb3a9deb 100644 (file)
--- a/components/cluster/clustercomponent.cpp
+++ b/components/cluster/clustercomponent.cpp
@@ -164,13 +164,7 @@ void ClusterComponent::ListenerThreadProc(const Socket::Ptr& server)
        for (;;) {
                Socket::Ptr client = server->Accept();
 
-               try {
-                       NewClientHandler(client, TlsRoleServer);
-               } catch (const std::exception& ex) {
-                       std::stringstream message;
-                       message << "Error for new JSON-RPC socket: " << boost::diagnostic_information(ex);
-                       Log(LogInformation, "cluster", message.str());
-               }
+               Utility::QueueAsyncCallback(bind(&ClusterComponent::NewClientHandler, this, client, TlsRoleServer));
        }
 }
 
@@ -192,12 +186,8 @@ void ClusterComponent::AddConnection(const String& node, const String& service)
 
        TcpSocket::Ptr client = boost::make_shared<TcpSocket>();
 
-       try {
-               client->Connect(node, service);
-               NewClientHandler(client, TlsRoleClient);
-       } catch (const std::exception& ex) {
-               Log(LogInformation, "cluster", "Could not connect to " + node + ":" + service + ": " + ex.what());
-       }
+       client->Connect(node, service);
+       Utility::QueueAsyncCallback(bind(&ClusterComponent::NewClientHandler, this, client, TlsRoleClient));
 }
 
 /**