aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
index 477b49df3b6..5c44678b51c 100644
--- a/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/ElasticSearch.java
@@ -126,15 +126,19 @@ public class ElasticSearch extends Process {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
- LOGGER.warn("ES Node is being shutdown.", e);
+ node.close();
}
}
+ terminate();
}
public void onTerminate() {
if (node != null && !node.isClosed()) {
node.close();
}
+ if (node != null) {
+ node.stop();
+ }
}
public static void main(String... args) throws InterruptedException {