tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 21:55:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7926 from Icinga/bugfix/jsonrpcconnection-handleandwriteheartbeats-m_endpoint-getname

Browse Source 
JsonRpcConnection#HandleAndWriteHeartbeats(): check !!#m_Endpoint
This commit is contained in:
Noah Hilverling 2020-06-03 15:46:38 +02:00 committed by GitHub
commit 84b052b314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/remote/jsonrpcconnection-heartbeat.cpp
View File

@ -28,9 +28,17 @@ void JsonRpcConnection::HandleAndWriteHeartbeats(boost::asio::yield_context yc)
} }
if (m_NextHeartbeat != 0 && m_NextHeartbeat < Utility::GetTime()) { if (m_NextHeartbeat != 0 && m_NextHeartbeat < Utility::GetTime()) {
Log(LogWarning, "JsonRpcConnection") {
<< "Client for endpoint '" << m_Endpoint->GetName() << "' has requested " Log logMsg (LogWarning, "JsonRpcConnection");
<< "heartbeat message but hasn't responded in time. Closing connection.";
if (m_Endpoint) {
logMsg << "Client for endpoint '" << m_Endpoint->GetName() << "'";
} else {
logMsg << "Anonymous client";
}
logMsg << " has requested heartbeat message but hasn't responded in time. Closing connection.";
}
Disconnect(); Disconnect();
break; break;