X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=protocol%2Futil%2FAsyncEventServer.cpp;h=d404becdbb9c5711f5d6f2203a8a14864ef49441;hb=7e7ef09558efdd89c3168017592978e90531f76d;hp=8348c56b97f4754d7bbaf3ddd992643e6b7b77c9;hpb=f529ebe9cc9c0a58a6ba4a1ebcd377b4dabf830a;p=casparcg

diff --git a/protocol/util/AsyncEventServer.cpp b/protocol/util/AsyncEventServer.cpp
index 8348c56b9..d404becdb 100644
--- a/protocol/util/AsyncEventServer.cpp
+++ b/protocol/util/AsyncEventServer.cpp
@@ -329,6 +329,12 @@ struct AsyncEventServer::implementation : public spl::enable_shared_from_this<im
 		
         if (!error)
 		{
+			boost::system::error_code ec;
+			socket->set_option(boost::asio::socket_base::keep_alive(true), ec);
+
+			if (ec)
+				CASPAR_LOG(warning) << print() << L" Failed to enable TCP keep-alive on socket";
+			
 			auto conn = connection::create(service_, socket, protocol_factory_, connection_set_);
 			connection_set_->insert(conn);
 
@@ -341,6 +347,11 @@ struct AsyncEventServer::implementation : public spl::enable_shared_from_this<im
 		start_accept();
     }
 
+	std::wstring print() const
+	{
+		return L"async_event_server[:" + boost::lexical_cast<std::wstring>(acceptor_.local_endpoint().port()) + L"]";
+	}
+
 	void add_client_lifecycle_object_factory(const lifecycle_factory_t& factory)
 	{
 		auto self = shared_from_this();