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

Revert "Add OnNewNotificationResult signal and ProcessNotificationResult handler" 

This reverts commit ac483f2a8a.
This commit is contained in:
Michael Friedrich 2020-01-07 14:21:43 +01:00
parent 152709071d
commit 3605076f8b
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/icinga/notification.cpp
View File

@ -23,7 +23,6 @@ std::map<String, int> Notification::m_StateFilterMap;
std::map<String, int> Notification::m_TypeFilterMap;
boost::signals2::signal<void (const Notification::Ptr&, const MessageOrigin::Ptr&)> Notification::OnNextNotificationChanged;
boost::signals2::signal<void (const Notification::Ptr&, const NotificationResult::Ptr&, const MessageOrigin::Ptr&)> Notification::OnNewNotificationResult;
String NotificationNameComposer::MakeName(const String& shortName, const Object::Ptr& context) const
{
@ -528,15 +527,6 @@ void Notification::ExecuteNotificationHelper(NotificationType type, const User::
}
}
void Notification::ProcessNotificationResult(const NotificationResult::Ptr& nr, const MessageOrigin::Ptr& origin)
{
if (!nr)
return;
/* Notify cluster, API and feature events. */
OnNewNotificationResult(this, nr, origin);
}
int icinga::ServiceStateToFilter(ServiceState state)
{
switch (state) {

4
lib/icinga/notification.hpp
View File

@ -10,7 +10,6 @@
#include "icinga/usergroup.hpp"
#include "icinga/timeperiod.hpp"
#include "icinga/checkresult.hpp"
#include "icinga/notificationresult.hpp"
#include "remote/endpoint.hpp"
#include "remote/messageorigin.hpp"
#include "base/array.hpp"
@ -83,8 +82,6 @@ public:
Endpoint::Ptr GetCommandEndpoint() const;
void ProcessNotificationResult(const NotificationResult::Ptr& nr, const MessageOrigin::Ptr& origin);
// Logging, etc.
static String NotificationTypeToString(NotificationType type);
// Compat, used for notifications, etc.
@ -95,7 +92,6 @@ public:
static String NotificationHostStateToString(HostState state);
static boost::signals2::signal<void (const Notification::Ptr&, const MessageOrigin::Ptr&)> OnNextNotificationChanged;
static boost::signals2::signal<void (const Notification::Ptr&, const NotificationResult::Ptr&, const MessageOrigin::Ptr&)> OnNewNotificationResult;
void Validate(int types, const ValidationUtils& utils) override;