Merge pull request #7050 from Icinga/feature/previous-state-change

[icinga2] / lib / notification / notificationcomponent.cpp

diff --git a/lib/notification/notificationcomponent.cpp b/lib/notification/notificationcomponent.cpp
index 04b40274cd3ca654b241f22c1b43cd22b559aec0..36fe8ecaa68996c2d0f469698cdc12f6a08a605c 100644 (file)
--- a/lib/notification/notificationcomponent.cpp
+++ b/lib/notification/notificationcomponent.cpp
@@ -1,21 +1,4 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)      *
- *                                                                            *
- * This program is free software; you can redistribute it and/or              *
- * modify it under the terms of the GNU General Public License                *
- * as published by the Free Software Foundation; either version 2             *
- * of the License, or (at your option) any later version.                     *
- *                                                                            *
- * This program is distributed in the hope that it will be useful,            *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
- * GNU General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program; if not, write to the Free Software Foundation     *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
- ******************************************************************************/
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 #include "notification/notificationcomponent.hpp"
 #include "notification/notificationcomponent-ti.cpp"
@@ -81,13 +64,17 @@ void NotificationComponent::NotificationTimerHandler()
 {
        double now = Utility::GetTime();
 
+       /* Function already checks whether 'api' feature is enabled. */
+       Endpoint::Ptr myEndpoint = Endpoint::GetLocalEndpoint();
+
        for (const Notification::Ptr& notification : ConfigType::GetObjectsByType<Notification>()) {
                if (!notification->IsActive())
                        continue;
 
                String notificationName = notification->GetName();
 
-               if (notification->IsPaused() && GetEnableHA()) {
+               /* Skip notification if paused, in a cluster setup & HA feature is enabled. */
+               if (notification->IsPaused() && myEndpoint && GetEnableHA()) {
                        Log(LogNotice, "NotificationComponent")
                                << "Reminder notification '" << notificationName << "': HA cluster active, this endpoint does not have the authority (paused=true). Skipping.";
                        continue;