From aeacbe44ca67e4e4b4e51530e08cf97a12f43172 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Fri, 5 Dec 2014 15:34:44 +0100 Subject: [PATCH] Removed redundant if statement Original commit: elastic/x-pack-elasticsearch@2de43dc7d5ed36276ece531110d40644baad6be9 --- src/main/java/org/elasticsearch/alerts/AlertManager.java | 3 +++ src/main/java/org/elasticsearch/alerts/AlertsStore.java | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/elasticsearch/alerts/AlertManager.java b/src/main/java/org/elasticsearch/alerts/AlertManager.java index 13fde0ded69..c04bc605898 100644 --- a/src/main/java/org/elasticsearch/alerts/AlertManager.java +++ b/src/main/java/org/elasticsearch/alerts/AlertManager.java @@ -265,6 +265,7 @@ public class AlertManager extends AbstractComponent { if (configurationManager.start(initialState)) { break; } + logger.error("CONFIG NOT STARTED"); clusterState = newClusterState(clusterState); } // Try to load alert store before the action manager, b/c action depends on alert store @@ -272,12 +273,14 @@ public class AlertManager extends AbstractComponent { if (alertsStore.start(clusterState)) { break; } + logger.error("STORE NOT STARTED"); clusterState = newClusterState(clusterState); } while (true) { if (actionManager.start(clusterState)) { break; } + logger.error("ACTION NOT STARTED"); clusterState = newClusterState(clusterState); } diff --git a/src/main/java/org/elasticsearch/alerts/AlertsStore.java b/src/main/java/org/elasticsearch/alerts/AlertsStore.java index f612ecca3ef..aec966ae1a1 100644 --- a/src/main/java/org/elasticsearch/alerts/AlertsStore.java +++ b/src/main/java/org/elasticsearch/alerts/AlertsStore.java @@ -152,10 +152,6 @@ public class AlertsStore extends AbstractComponent { return true; } - if (!configurationManager.start(state)) { - return false; - } - IndexMetaData alertIndexMetaData = state.getMetaData().index(ALERT_INDEX); if (alertIndexMetaData != null) { logger.debug("Previous alerting index");