tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix check result, downtime and comment message types. 

Fixes #5113
This commit is contained in:
Gunnar Beutner 2013-11-20 15:33:04 +01:00
parent f9153a96f5
commit 7b1d34dae7
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
components/cluster/clusterlistener.cpp
View File

@ -73,6 +73,8 @@ void ClusterListener::Start(void)
m_ClusterTimer->SetInterval(5); m_ClusterTimer->SetInterval(5);
m_ClusterTimer->Start(); m_ClusterTimer->Start();
m_MessageQueue.SetExceptionCallback(&ClusterListener::MessageExceptionHandler);
Service::OnNewCheckResult.connect(boost::bind(&ClusterListener::CheckResultHandler, this, _1, _2, _3)); Service::OnNewCheckResult.connect(boost::bind(&ClusterListener::CheckResultHandler, this, _1, _2, _3));
Service::OnNextCheckChanged.connect(boost::bind(&ClusterListener::NextCheckChangedHandler, this, _1, _2, _3)); Service::OnNextCheckChanged.connect(boost::bind(&ClusterListener::NextCheckChangedHandler, this, _1, _2, _3));
Notification::OnNextNotificationChanged.connect(boost::bind(&ClusterListener::NextNotificationChangedHandler, this, _1, _2, _3)); Notification::OnNextNotificationChanged.connect(boost::bind(&ClusterListener::NextNotificationChangedHandler, this, _1, _2, _3));
@ -670,7 +672,7 @@ void ClusterListener::CheckResultHandler(const Service::Ptr& service, const Chec
Dictionary::Ptr params = make_shared<Dictionary>(); Dictionary::Ptr params = make_shared<Dictionary>();
params->Set("service", service->GetName()); params->Set("service", service->GetName());
params->Set("check_result", cr); params->Set("check_result", Serialize(cr));
Dictionary::Ptr message = make_shared<Dictionary>(); Dictionary::Ptr message = make_shared<Dictionary>();
message->Set("jsonrpc", "2.0"); message->Set("jsonrpc", "2.0");
@ -841,7 +843,7 @@ void ClusterListener::CommentAddedHandler(const Service::Ptr& service, const Com
Dictionary::Ptr params = make_shared<Dictionary>(); Dictionary::Ptr params = make_shared<Dictionary>();
params->Set("service", service->GetName()); params->Set("service", service->GetName());
params->Set("comment", comment); params->Set("comment", Serialize(comment));
Dictionary::Ptr message = make_shared<Dictionary>(); Dictionary::Ptr message = make_shared<Dictionary>();
message->Set("jsonrpc", "2.0"); message->Set("jsonrpc", "2.0");
@ -879,7 +881,7 @@ void ClusterListener::DowntimeAddedHandler(const Service::Ptr& service, const Do
Dictionary::Ptr params = make_shared<Dictionary>(); Dictionary::Ptr params = make_shared<Dictionary>();
params->Set("service", service->GetName()); params->Set("service", service->GetName());
params->Set("downtime", downtime); params->Set("downtime", Serialize(downtime));
Dictionary::Ptr message = make_shared<Dictionary>(); Dictionary::Ptr message = make_shared<Dictionary>();
message->Set("jsonrpc", "2.0"); message->Set("jsonrpc", "2.0");
@ -955,6 +957,11 @@ void ClusterListener::AsyncMessageHandler(const Endpoint::Ptr& sender, const Dic
m_MessageQueue.Enqueue(boost::bind(&ClusterListener::MessageHandler, this, sender, message)); m_MessageQueue.Enqueue(boost::bind(&ClusterListener::MessageHandler, this, sender, message));
} }
void ClusterListener::MessageExceptionHandler(boost::exception_ptr exp)
{
Log(LogCritical, "cluster", "Exception while processing cluster message: " + boost::diagnostic_information(exp));
}
void ClusterListener::MessageHandler(const Endpoint::Ptr& sender, const Dictionary::Ptr& message) void ClusterListener::MessageHandler(const Endpoint::Ptr& sender, const Dictionary::Ptr& message)
{ {
sender->SetSeen(Utility::GetTime()); sender->SetSeen(Utility::GetTime());
@ -1015,7 +1022,7 @@ void ClusterListener::MessageHandler(const Endpoint::Ptr& sender, const Dictiona
return; return;
} }
CheckResult::Ptr cr = params->Get("check_result"); CheckResult::Ptr cr = Deserialize(params->Get("check_result"));
if (!cr) if (!cr)
return; return;
@ -1209,7 +1216,7 @@ void ClusterListener::MessageHandler(const Endpoint::Ptr& sender, const Dictiona
return; return;
} }
Comment::Ptr comment = params->Get("comment"); Comment::Ptr comment = Deserialize(params->Get("comment"));
service->AddComment(comment->GetEntryType(), comment->GetAuthor(), service->AddComment(comment->GetEntryType(), comment->GetAuthor(),
comment->GetText(), comment->GetExpireTime(), comment->GetId(), sender->GetName()); comment->GetText(), comment->GetExpireTime(), comment->GetId(), sender->GetName());
@ -1252,7 +1259,7 @@ void ClusterListener::MessageHandler(const Endpoint::Ptr& sender, const Dictiona
return; return;
} }
Downtime::Ptr downtime = params->Get("downtime"); Downtime::Ptr downtime = Deserialize(params->Get("downtime"));
service->AddDowntime(downtime->GetAuthor(), downtime->GetComment(), service->AddDowntime(downtime->GetAuthor(), downtime->GetComment(),
downtime->GetStartTime(), downtime->GetEndTime(), downtime->GetStartTime(), downtime->GetEndTime(),

2
components/cluster/clusterlistener.h
View File

@ -111,6 +111,8 @@ private:
void SetSecurityInfo(const Dictionary::Ptr& message, const DynamicObject::Ptr& object, int privs); void SetSecurityInfo(const Dictionary::Ptr& message, const DynamicObject::Ptr& object, int privs);
void PersistMessage(const Endpoint::Ptr& source, const Dictionary::Ptr& message); void PersistMessage(const Endpoint::Ptr& source, const Dictionary::Ptr& message);
static void MessageExceptionHandler(boost::exception_ptr exp);
}; };
} }