/v1/events: terminate on disconnect

diff --git a/lib/remote/eventshandler.cpp b/lib/remote/eventshandler.cpp
index 5e8e0590173b310ea70e83995195340b2dc3c70b..4bc0285149ee0f39ac47c653c2b02b38e5d1c04b 100644 (file)
--- a/lib/remote/eventshandler.cpp
+++ b/lib/remote/eventshandler.cpp
@@ -117,6 +117,8 @@ bool EventsHandler::HandleRequest(
                        asio::async_write(stream, payload, yc);
                        asio::async_write(stream, newLine, yc);
                        stream.async_flush(yc);
+               } else if (server.Disconnected()) {
+                       return true;
                }
        }
 }

diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index 7d08d8ae43b5146299191b242494c8c214a7b7a7..c06e381e2392bb3d8d64e88e53abd4b384dc9f83 100644 (file)
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -114,6 +114,11 @@ void HttpServerConnection::StartStreaming()
        });
 }
 
+bool HttpServerConnection::Disconnected()
+{
+       return m_ShuttingDown;
+}
+
 static inline
 bool EnsureValidHeaders(
        AsioTlsStream& stream,

diff --git a/lib/remote/httpserverconnection.hpp b/lib/remote/httpserverconnection.hpp
index 56876829ca6b01b712410375ca998a8edd313c66..b32db86a6c91da3e0216280a4572ee2add54852d 100644 (file)
--- a/lib/remote/httpserverconnection.hpp
+++ b/lib/remote/httpserverconnection.hpp
@@ -29,6 +29,8 @@ public:
        void Disconnect();
        void StartStreaming();
 
+       bool Disconnected();
+
 private:
        ApiUser::Ptr m_ApiUser;
        std::shared_ptr<AsioTlsStream> m_Stream;