mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-24 06:05:01 +02:00
Revert "Add OnNewNotificationResult signal and ProcessNotificationResult handler"
This reverts commit ac483f2a8a07e4962068408d18b10a17204b6454.
This commit is contained in:
parent
152709071d
commit
3605076f8b
@ -23,7 +23,6 @@ std::map<String, int> Notification::m_StateFilterMap;
|
|||||||
std::map<String, int> Notification::m_TypeFilterMap;
|
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 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
|
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)
|
int icinga::ServiceStateToFilter(ServiceState state)
|
||||||
{
|
{
|
||||||
switch (state) {
|
switch (state) {
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
#include "icinga/usergroup.hpp"
|
#include "icinga/usergroup.hpp"
|
||||||
#include "icinga/timeperiod.hpp"
|
#include "icinga/timeperiod.hpp"
|
||||||
#include "icinga/checkresult.hpp"
|
#include "icinga/checkresult.hpp"
|
||||||
#include "icinga/notificationresult.hpp"
|
|
||||||
#include "remote/endpoint.hpp"
|
#include "remote/endpoint.hpp"
|
||||||
#include "remote/messageorigin.hpp"
|
#include "remote/messageorigin.hpp"
|
||||||
#include "base/array.hpp"
|
#include "base/array.hpp"
|
||||||
@ -83,8 +82,6 @@ public:
|
|||||||
|
|
||||||
Endpoint::Ptr GetCommandEndpoint() const;
|
Endpoint::Ptr GetCommandEndpoint() const;
|
||||||
|
|
||||||
void ProcessNotificationResult(const NotificationResult::Ptr& nr, const MessageOrigin::Ptr& origin);
|
|
||||||
|
|
||||||
// Logging, etc.
|
// Logging, etc.
|
||||||
static String NotificationTypeToString(NotificationType type);
|
static String NotificationTypeToString(NotificationType type);
|
||||||
// Compat, used for notifications, etc.
|
// Compat, used for notifications, etc.
|
||||||
@ -95,7 +92,6 @@ public:
|
|||||||
static String NotificationHostStateToString(HostState state);
|
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 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;
|
void Validate(int types, const ValidationUtils& utils) override;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user