honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed redundant if statement 

Original commit: elastic/x-pack-elasticsearch@2de43dc7d5
This commit is contained in:
Martijn van Groningen 2014-12-05 15:34:44 +01:00
parent 1258a4c327
commit aeacbe44ca
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/elasticsearch/alerts/AlertManager.java
View File

@ -265,6 +265,7 @@ public class AlertManager extends AbstractComponent {
if (configurationManager.start(initialState)) { if (configurationManager.start(initialState)) {
break; break;
} }
logger.error("CONFIG NOT STARTED");
clusterState = newClusterState(clusterState); clusterState = newClusterState(clusterState);
} }
// Try to load alert store before the action manager, b/c action depends on alert store // 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)) { if (alertsStore.start(clusterState)) {
break; break;
} }
logger.error("STORE NOT STARTED");
clusterState = newClusterState(clusterState); clusterState = newClusterState(clusterState);
} }
while (true) { while (true) {
if (actionManager.start(clusterState)) { if (actionManager.start(clusterState)) {
break; break;
} }
logger.error("ACTION NOT STARTED");
clusterState = newClusterState(clusterState); clusterState = newClusterState(clusterState);
} }

4
src/main/java/org/elasticsearch/alerts/AlertsStore.java
View File

@ -152,10 +152,6 @@ public class AlertsStore extends AbstractComponent {
return true; return true;
} }
if (!configurationManager.start(state)) {
return false;
}
IndexMetaData alertIndexMetaData = state.getMetaData().index(ALERT_INDEX); IndexMetaData alertIndexMetaData = state.getMetaData().index(ALERT_INDEX);
if (alertIndexMetaData != null) { if (alertIndexMetaData != null) {
logger.debug("Previous alerting index"); logger.debug("Previous alerting index");