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

Implement support for cleaning up expired API callbacks

Browse Source 
refs #5450
This commit is contained in:
Gunnar Beutner 2017-08-31 11:10:14 +02:00
parent cc43dc734b
commit 03f5ccd252
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/remote/jsonrpcconnection.cpp
View File

@ -194,13 +194,18 @@ void JsonRpcConnection::MessageHandler(const String& jsonString)
String id = vid; String id = vid;
auto it = m_ApiCallbacks.find(id); ApiCallbackInfo aci;
if (it == m_ApiCallbacks.end()) {
return; boost::mutex::scoped_lock lock(m_ApiCallbacksMutex);
auto it = m_ApiCallbacks.find(id);
ApiCallbackInfo aci = it->second; if (it == m_ApiCallbacks.end())
m_ApiCallbacks.erase(it); return;
aci = it->second;
m_ApiCallbacks.erase(it);
}
try { try {
aci.Callback(message); aci.Callback(message);
@ -301,6 +306,11 @@ Value SetLogPositionHandler(const MessageOrigin::Ptr& origin, const Dictionary::
return Empty; return Empty;
} }
bool ApiCallbackInfo::IsExpired(void) const
{
return Timestamp < Utility::GetTime() - 300;
}
void JsonRpcConnection::CheckLiveness(void) void JsonRpcConnection::CheckLiveness(void)
{ {
if (m_Seen < Utility::GetTime() - 60 && (!m_Endpoint || !m_Endpoint->GetSyncing())) { if (m_Seen < Utility::GetTime() - 60 && (!m_Endpoint || !m_Endpoint->GetSyncing())) {
@ -308,6 +318,18 @@ void JsonRpcConnection::CheckLiveness(void)
<< "No messages for identity '" << m_Identity << "' have been received in the last 60 seconds."; << "No messages for identity '" << m_Identity << "' have been received in the last 60 seconds.";
Disconnect(); Disconnect();
} }
{
boost::mutex::scoped_lock lock(m_ApiCallbacksMutex);
for (auto it = m_ApiCallbacks.begin(), last = m_ApiCallbacks.end(); it != last; ) {
if (it->second.IsExpired()) {
it = m_ApiCallbacks.erase(it);
} else {
++it;
}
}
}
} }
void JsonRpcConnection::TimeoutTimerHandler(void) void JsonRpcConnection::TimeoutTimerHandler(void)
@ -363,5 +385,8 @@ void JsonRpcConnection::RegisterCallback(const String& id, const boost::function
aci.Timestamp = Utility::GetTime(); aci.Timestamp = Utility::GetTime();
aci.Callback = callback; aci.Callback = callback;
m_ApiCallbacks[id] = aci; {
boost::mutex::scoped_lock lock(m_ApiCallbacksMutex);
m_ApiCallbacks[id] = aci;
}
} }

3
lib/remote/jsonrpcconnection.hpp
View File

@ -47,6 +47,8 @@ struct ApiCallbackInfo
{ {
double Timestamp; double Timestamp;
boost::function<void (const Dictionary::Ptr&)> Callback; boost::function<void (const Dictionary::Ptr&)> Callback;
bool IsExpired(void) const;
}; };
/** /**
@ -96,6 +98,7 @@ private:
double m_HeartbeatTimeout; double m_HeartbeatTimeout;
boost::mutex m_DataHandlerMutex; boost::mutex m_DataHandlerMutex;
std::map<String, ApiCallbackInfo> m_ApiCallbacks; std::map<String, ApiCallbackInfo> m_ApiCallbacks;
boost::mutex m_ApiCallbacksMutex;
StreamReadContext m_Context; StreamReadContext m_Context;