Fix crash during cluster log replay

fixes #9876

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 84b89ad7f35542a1e27bc836016389aa0d8ca9d5..13d32abb6a8fd53b4efd5caddf12dd5f3491df59 100644 (file)
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -262,12 +262,22 @@ void ApiListener::AddConnection(const Endpoint::Ptr& endpoint)
        }
 }
 
+void ApiListener::NewClientHandler(const Socket::Ptr& client, const String& hostname, ConnectionRole role)
+{
+       try {
+               NewClientHandler(client, hostname, role);
+       } catch (const std::exception& ex) {
+               Log(LogCritical, "ApiListener")
+                   << "Exception while handling new API client connection: " << DiagnosticInformation(ex);
+       }
+}
+
 /**
  * Processes a new client connection.
  *
  * @param client The new client.
  */
-void ApiListener::NewClientHandler(const Socket::Ptr& client, const String& hostname, ConnectionRole role)
+void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const String& hostname, ConnectionRole role)
 {
        CONTEXT("Handling new API client connection");
 

diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp
index c7fccb38bfdfc21ee0b905d8f9843c535bf81219..9842b5a3849f351da0b6b01d21f397181a4db94b 100644 (file)
--- a/lib/remote/apilistener.hpp
+++ b/lib/remote/apilistener.hpp
@@ -93,6 +93,7 @@ private:
        void AddConnection(const Endpoint::Ptr& endpoint);
 
        void NewClientHandler(const Socket::Ptr& client, const String& hostname, ConnectionRole role);
+       void NewClientHandlerInternal(const Socket::Ptr& client, const String& hostname, ConnectionRole role);
        void ListenerThreadProc(const Socket::Ptr& server);
 
        WorkQueue m_RelayQueue;