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

New event queue: handle empty filter

Browse Source
This commit is contained in:
Alexander A. Klimov 2019-04-05 17:41:39 +02:00 committed by Michael Friedrich
parent 94db282fd1
commit 5e8b4280bc
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/remote/eventqueue.cpp
View File

@ -145,7 +145,7 @@ EventQueueRegistry *EventQueueRegistry::GetInstance()
}
std::mutex EventsInbox::m_FiltersMutex;
std::map<String, EventsInbox::Filter> EventsInbox::m_Filters;
std::map<String, EventsInbox::Filter> EventsInbox::m_Filters ({{"", EventsInbox::Filter{1, nullptr}}});
EventsRouter EventsRouter::m_Instance;
@ -262,17 +262,19 @@ EventsFilter::operator bool()
void EventsFilter::Push(Dictionary::Ptr event)
{
for (auto& perFilter : m_Inboxes) {
ScriptFrame frame(true);
frame.Sandboxed = true;
if (perFilter.first) {
ScriptFrame frame(true);
frame.Sandboxed = true;
try {
if (!FilterUtility::EvaluateFilter(frame, perFilter.first.get(), event, "event")) {
try {
if (!FilterUtility::EvaluateFilter(frame, perFilter.first.get(), event, "event")) {
continue;
}
} catch (const std::exception& ex) {
Log(LogWarning, "EventQueue")
<< "Error occurred while evaluating event filter for queue: " << DiagnosticInformation(ex);
continue;
}
} catch (const std::exception& ex) {
Log(LogWarning, "EventQueue")
<< "Error occurred while evaluating event filter for queue: " << DiagnosticInformation(ex);
continue;
}
for (auto& inbox : perFilter.second) {