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

cluster: Fix heartbeat messages.

Browse Source
This commit is contained in:
Gunnar Beutner 2013-09-11 09:09:04 +02:00
parent fe13be0e9c
commit 2e6f7d3cdb
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/cluster/clustercomponent.cpp
View File

@ -443,9 +443,13 @@ void ClusterComponent::NewClientHandler(const Socket::Ptr& client, TlsRole role)
void ClusterComponent::ClusterTimerHandler(void) void ClusterComponent::ClusterTimerHandler(void)
{ {
/* broadcast a heartbeat message */ /* broadcast a heartbeat message */
Dictionary::Ptr params = boost::make_shared<Dictionary>();
params->Set("identity", GetIdentity());
Dictionary::Ptr message = boost::make_shared<Dictionary>(); Dictionary::Ptr message = boost::make_shared<Dictionary>();
message->Set("jsonrpc", "2.0"); message->Set("jsonrpc", "2.0");
message->Set("method", "cluster::HeartBeat"); message->Set("method", "cluster::HeartBeat");
message->Set("params", params);
RelayMessage(Endpoint::Ptr(), message, false); RelayMessage(Endpoint::Ptr(), message, false);
@ -808,17 +812,21 @@ void ClusterComponent::MessageHandler(const Endpoint::Ptr& sender, const Diction
RelayMessage(sender, message, true); RelayMessage(sender, message, true);
if (message->Get("method") == "cluster::HeartBeat") {
sender->SetSeen(Utility::GetTime());
return;
}
Dictionary::Ptr params = message->Get("params"); Dictionary::Ptr params = message->Get("params");
if (!params) if (!params)
return; return;
if (message->Get("method") == "cluster::CheckResult") { if (message->Get("method") == "cluster::HeartBeat") {
sender->SetSeen(Utility::GetTime());
String identity = params->Get("identity");
Endpoint::Ptr endpoint = Endpoint::GetByName(identity);
if (endpoint && endpoint != sender)
endpoint->SetSeen(Utility::GetTime());
} else if (message->Get("method") == "cluster::CheckResult") {
String svc = params->Get("service"); String svc = params->Get("service");
Service::Ptr service = Service::GetByName(svc); Service::Ptr service = Service::GetByName(svc);