tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7886 from Icinga/bugfix/icingadb-flapping-history-more-ends-than-starts-7885

Browse Source 
IcingaDB: make signal handlers synchronous
This commit is contained in:
Noah Hilverling 2020-03-04 13:39:31 +01:00 committed by GitHub
commit cef4c46ba8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/icingadb/icingadb-objects.cpp
View File

@ -1962,7 +1962,7 @@ void IcingaDB::StateChangeHandler(const ConfigObject::Ptr& object)
void IcingaDB::StateChangeHandler(const ConfigObject::Ptr& object, const CheckResult::Ptr& cr, StateType type) void IcingaDB::StateChangeHandler(const ConfigObject::Ptr& object, const CheckResult::Ptr& cr, StateType type)
{ {
for (const IcingaDB::Ptr& rw : ConfigType::GetObjectsByType<IcingaDB>()) { for (const IcingaDB::Ptr& rw : ConfigType::GetObjectsByType<IcingaDB>()) {
rw->m_WorkQueue.Enqueue([rw, object, cr, type]() { rw->SendStatusUpdate(object, cr, type); }); rw->SendStatusUpdate(object, cr, type);
} }
} }
@ -1974,14 +1974,14 @@ void IcingaDB::VersionChangedHandler(const ConfigObject::Ptr& object)
// Create or update the object config // Create or update the object config
for (const IcingaDB::Ptr& rw : ConfigType::GetObjectsByType<IcingaDB>()) { for (const IcingaDB::Ptr& rw : ConfigType::GetObjectsByType<IcingaDB>()) {
if (rw) if (rw)
rw->m_WorkQueue.Enqueue([rw, object]() { rw->SendConfigUpdate(object, true); }); rw->SendConfigUpdate(object, true);
} }
} else if (!object->IsActive() && } else if (!object->IsActive() &&
object->GetExtension("ConfigObjectDeleted")) { // same as in apilistener-configsync.cpp object->GetExtension("ConfigObjectDeleted")) { // same as in apilistener-configsync.cpp
// Delete object config // Delete object config
for (const IcingaDB::Ptr& rw : ConfigType::GetObjectsByType<IcingaDB>()) { for (const IcingaDB::Ptr& rw : ConfigType::GetObjectsByType<IcingaDB>()) {
if (rw) if (rw)
rw->m_WorkQueue.Enqueue([rw, object]() { rw->SendConfigDelete(object); }); rw->SendConfigDelete(object);
} }
} }
} }
@ -1991,7 +1991,7 @@ void IcingaDB::DowntimeStartedHandler(const Downtime::Ptr& downtime)
StateChangeHandler(downtime->GetCheckable()); StateChangeHandler(downtime->GetCheckable());
for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) { for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) {
rw->m_WorkQueue.Enqueue([rw, downtime]() { rw->SendStartedDowntime(downtime); }); rw->SendStartedDowntime(downtime);
} }
} }
@ -2000,17 +2000,10 @@ void IcingaDB::DowntimeRemovedHandler(const Downtime::Ptr& downtime)
StateChangeHandler(downtime->GetCheckable()); StateChangeHandler(downtime->GetCheckable());
for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) { for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) {
rw->m_WorkQueue.Enqueue([rw, downtime]() { rw->SendRemovedDowntime(downtime); }); rw->SendRemovedDowntime(downtime);
} }
} }
struct ATU
{
String Author;
String Text;
std::set<User::Ptr> Users;
};
void IcingaDB::NotificationSentToAllUsersHandler( void IcingaDB::NotificationSentToAllUsersHandler(
const Notification::Ptr& notification, const Checkable::Ptr& checkable, const std::set<User::Ptr>& users, const Notification::Ptr& notification, const Checkable::Ptr& checkable, const std::set<User::Ptr>& users,
NotificationType type, const CheckResult::Ptr& cr, const String& author, const String& text NotificationType type, const CheckResult::Ptr& cr, const String& author, const String& text
@ -2019,12 +2012,8 @@ void IcingaDB::NotificationSentToAllUsersHandler(
auto rws (ConfigType::GetObjectsByType<IcingaDB>()); auto rws (ConfigType::GetObjectsByType<IcingaDB>());
if (!rws.empty()) { if (!rws.empty()) {
auto atu (Shared<ATU>::Make(ATU{author, text, users}));
for (auto& rw : rws) { for (auto& rw : rws) {
rw->m_WorkQueue.Enqueue([rw, notification, checkable, atu, type, cr]() { rw->SendSentNotification(notification, checkable, users, type, cr, author, text);
rw->SendSentNotification(notification, checkable, atu->Users, type, cr, atu->Author, atu->Text);
});
} }
} }
} }
@ -2032,14 +2021,14 @@ void IcingaDB::NotificationSentToAllUsersHandler(
void IcingaDB::CommentAddedHandler(const Comment::Ptr& comment) void IcingaDB::CommentAddedHandler(const Comment::Ptr& comment)
{ {
for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) { for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) {
rw->m_WorkQueue.Enqueue([rw, comment]() { rw->SendAddedComment(comment); }); rw->SendAddedComment(comment);
} }
} }
void IcingaDB::CommentRemovedHandler(const Comment::Ptr& comment) void IcingaDB::CommentRemovedHandler(const Comment::Ptr& comment)
{ {
for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) { for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) {
rw->m_WorkQueue.Enqueue([rw, comment]() { rw->SendRemovedComment(comment); }); rw->SendRemovedComment(comment);
} }
} }
@ -2048,40 +2037,32 @@ void IcingaDB::FlappingChangeHandler(const Checkable::Ptr& checkable, double cha
auto flappingLastChange (checkable->GetFlappingLastChange()); auto flappingLastChange (checkable->GetFlappingLastChange());
for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) { for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) {
rw->m_WorkQueue.Enqueue([rw, checkable, changeTime, flappingLastChange]() { rw->SendFlappingChange(checkable, changeTime, flappingLastChange); }); rw->SendFlappingChange(checkable, changeTime, flappingLastChange);
} }
} }
void IcingaDB::NewCheckResultHandler(const Checkable::Ptr& checkable) void IcingaDB::NewCheckResultHandler(const Checkable::Ptr& checkable)
{ {
for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) { for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) {
rw->m_WorkQueue.Enqueue([rw, checkable]() { rw->SendNextUpdate(checkable); }); rw->SendNextUpdate(checkable);
} }
} }
void IcingaDB::NextCheckChangedHandler(const Checkable::Ptr& checkable) void IcingaDB::NextCheckChangedHandler(const Checkable::Ptr& checkable)
{ {
for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) { for (auto& rw : ConfigType::GetObjectsByType<IcingaDB>()) {
rw->m_WorkQueue.Enqueue([rw, checkable]() { rw->UpdateState(checkable); }); rw->UpdateState(checkable);
rw->m_WorkQueue.Enqueue([rw, checkable]() { rw->SendNextUpdate(checkable); }); rw->SendNextUpdate(checkable);
} }
} }
struct AuthorComment
{
String Author;
String Comment;
};
void IcingaDB::AcknowledgementSetHandler(const Checkable::Ptr& checkable, const String& author, const String& comment, AcknowledgementType type, bool persistent, double changeTime, double expiry) void IcingaDB::AcknowledgementSetHandler(const Checkable::Ptr& checkable, const String& author, const String& comment, AcknowledgementType type, bool persistent, double changeTime, double expiry)
{ {
auto rws (ConfigType::GetObjectsByType<IcingaDB>()); auto rws (ConfigType::GetObjectsByType<IcingaDB>());
if (!rws.empty()) { if (!rws.empty()) {
auto ac (Shared<AuthorComment>::Make(AuthorComment{author, comment}));
for (auto& rw : rws) { for (auto& rw : rws) {
rw->m_WorkQueue.Enqueue([rw, checkable, ac, type, persistent, changeTime, expiry]() { rw->SendAcknowledgementSet(checkable, ac->Author, ac->Comment, type, persistent, changeTime, expiry); }); rw->SendAcknowledgementSet(checkable, author, comment, type, persistent, changeTime, expiry);
} }
} }
} }
@ -2095,7 +2076,7 @@ void IcingaDB::AcknowledgementClearedHandler(const Checkable::Ptr& checkable, co
auto ackLastChange (checkable->GetAcknowledgementLastChange()); auto ackLastChange (checkable->GetAcknowledgementLastChange());
for (auto& rw : rws) { for (auto& rw : rws) {
rw->m_WorkQueue.Enqueue([rw, checkable, rb, changeTime, ackLastChange]() { rw->SendAcknowledgementCleared(checkable, *rb, changeTime, ackLastChange); }); rw->SendAcknowledgementCleared(checkable, *rb, changeTime, ackLastChange);
} }
} }
} }