[icinga-checkins] icinga.org: icinga2/master: Fix NotificationSentToAllUsers cluster event

git at icinga.org git at icinga.org
Tue Aug 16 09:31:00 CEST 2016


Module: icinga2
Branch: master
Commit: a34e01d0bb2712adc738ff52dae7cfd018b8d295
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=a34e01d0bb2712adc738ff52dae7cfd018b8d295

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Tue Aug 16 09:30:10 2016 +0200

Fix NotificationSentToAllUsers cluster event

refs #12444

---

 lib/icinga/clusterevents.cpp |    6 +++---
 lib/icinga/clusterevents.hpp |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/icinga/clusterevents.cpp b/lib/icinga/clusterevents.cpp
index b30ba73..d14b755 100644
--- a/lib/icinga/clusterevents.cpp
+++ b/lib/icinga/clusterevents.cpp
@@ -50,7 +50,7 @@ REGISTER_APIFUNCTION(UpdateRepository, event, &ClusterEvents::UpdateRepositoryAP
 REGISTER_APIFUNCTION(ExecuteCommand, event, &ClusterEvents::ExecuteCommandAPIHandler);
 REGISTER_APIFUNCTION(SendNotifications, event, &ClusterEvents::SendNotificationsAPIHandler);
 REGISTER_APIFUNCTION(NotificationSentUser, event, &ClusterEvents::NotificationSentUserAPIHandler);
-REGISTER_APIFUNCTION(NotificationSentAllUsers, event, &ClusterEvents::NotificationSentAllUsersAPIHandler);
+REGISTER_APIFUNCTION(NotificationSentToAllUsers, event, &ClusterEvents::NotificationSentToAllUsersAPIHandler);
 
 static Timer::Ptr l_RepositoryTimer;
 
@@ -972,13 +972,13 @@ void ClusterEvents::NotificationSentToAllUsersHandler(const Notification::Ptr& n
 
 	Dictionary::Ptr message = new Dictionary();
 	message->Set("jsonrpc", "2.0");
-	message->Set("method", "event::NotificationSentAllUsers");
+	message->Set("method", "event::NotificationSentToAllUsers");
 	message->Set("params", params);
 
 	listener->RelayMessage(origin, ConfigObject::Ptr(), message, true);
 }
 
-Value ClusterEvents::NotificationSentAllUsersAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
+Value ClusterEvents::NotificationSentToAllUsersAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params)
 {
 	Endpoint::Ptr endpoint = origin->FromClient->GetEndpoint();
 
diff --git a/lib/icinga/clusterevents.hpp b/lib/icinga/clusterevents.hpp
index 8df2ab8..a03f0b2 100644
--- a/lib/icinga/clusterevents.hpp
+++ b/lib/icinga/clusterevents.hpp
@@ -77,7 +77,7 @@ public:
 
 	static void NotificationSentToAllUsersHandler(const Notification::Ptr& notification, const Checkable::Ptr& checkable, const std::set<User::Ptr>& users,
 	    NotificationType notificationType, const CheckResult::Ptr& cr, const String& author, const String& commentText, const MessageOrigin::Ptr& origin);
-	static Value NotificationSentAllUsersAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
+	static Value NotificationSentToAllUsersAPIHandler(const MessageOrigin::Ptr& origin, const Dictionary::Ptr& params);
 };
 
 }



More information about the icinga-checkins mailing list