From: Gunnar Beutner <gunnar@beutner.name>
Date: Thu, 26 Feb 2015 11:41:47 +0000 (+0100)
Subject: Close client connections if we haven't received any messages in some time
X-Git-Tag: v2.3.0~116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3ccd2a1fbfbad47b4caeced290a826e6023d913;p=icinga2

Close client connections if we haven't received any messages in some time

refs #8485
---

diff --git a/lib/remote/apiclient.cpp b/lib/remote/apiclient.cpp
index 2304df3fb..d34eaadf0 100644
--- a/lib/remote/apiclient.cpp
+++ b/lib/remote/apiclient.cpp
@@ -45,6 +45,11 @@ ApiClient::ApiClient(const String& identity, bool authenticated, const TlsStream
 void ApiClient::Start(void)
 {
 	m_Stream->RegisterDataHandler(boost::bind(&ApiClient::DataAvailableHandler, this));
+
+	m_TimeoutTimer = new Timer();
+	m_TimeoutTimer->OnTimerExpired.connect(boost::bind(&ApiClient::TimeoutTimerHandler, this));
+	m_TimeoutTimer->SetInterval(15);
+	m_TimeoutTimer->Start();
 }
 
 String ApiClient::GetIdentity(void) const
@@ -84,8 +89,6 @@ void ApiClient::SendMessageSync(const Dictionary::Ptr& message)
 		if (m_Stream->IsEof())
 			return;
 		JsonRpc::SendMessage(m_Stream, message);
-		if (message->Get("method") != "log::SetLogPosition")
-			m_Seen = Utility::GetTime();
 	} catch (const std::exception& ex) {
 		std::ostringstream info;
 		info << "Error while sending JSON-RPC message for identity '" << m_Identity << "'";
@@ -128,8 +131,7 @@ bool ApiClient::ProcessMessage(void)
 	if (srs != StatusNewItem)
 		return false;
 
-	if (message->Get("method") != "log::SetLogPosition")
-		m_Seen = Utility::GetTime();
+	m_Seen = Utility::GetTime();
 
 	if (m_Endpoint && message->Contains("ts")) {
 		double ts = message->Get("ts");
@@ -254,3 +256,9 @@ Value RequestCertificateHandler(const MessageOrigin& origin, const Dictionary::P
 
 	return result;
 }
+
+void ApiClient::TimeoutTimerHandler(void)
+{
+	if (Utility::GetTime() - 60 > m_Seen)
+		Disconnect();
+}
diff --git a/lib/remote/apiclient.hpp b/lib/remote/apiclient.hpp
index de0b3eee5..ea015f375 100644
--- a/lib/remote/apiclient.hpp
+++ b/lib/remote/apiclient.hpp
@@ -72,6 +72,7 @@ private:
 	ConnectionRole m_Role;
 	double m_Seen;
 	double m_NextHeartbeat;
+	Timer::Ptr m_TimeoutTimer;
 
 	StreamReadContext m_Context;
 
@@ -80,6 +81,8 @@ private:
 	bool ProcessMessage(void);
 	void DataAvailableHandler(void);
 	void SendMessageSync(const Dictionary::Ptr& request);
+
+	void TimeoutTimerHandler(void);
 };
 
 }