honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-13 08:25:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't hang the main thread, keep a different, non daemon thread alive till we shutdown

Browse Source
This commit is contained in:
kimchy 2010-05-01 03:10:47 +03:00
parent 5d8d2cf4f9
commit d0a6342360
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
View File

@ -54,7 +54,9 @@ public class Bootstrap {
private Node node; private Node node;
private static Thread keepAliveThread; private static volatile Thread keepAliveThread;
private static volatile CountDownLatch keepAliveLatch;
private void setup(boolean addShutdownHook, Tuple<Settings, Environment> tuple) throws Exception { private void setup(boolean addShutdownHook, Tuple<Settings, Environment> tuple) throws Exception {
tuple = setupJmx(tuple); tuple = setupJmx(tuple);
@ -169,18 +171,18 @@ public class Bootstrap {
System.err.close(); System.err.close();
} }
final CountDownLatch latch = new CountDownLatch(1); keepAliveLatch = new CountDownLatch(1);
// keep this thread alive (non daemon thread) until we shutdown // keep this thread alive (non daemon thread) until we shutdown
Runtime.getRuntime().addShutdownHook(new Thread() { Runtime.getRuntime().addShutdownHook(new Thread() {
@Override public void run() { @Override public void run() {
latch.countDown(); keepAliveLatch.countDown();
} }
}); });
keepAliveThread = new Thread(new Runnable() { keepAliveThread = new Thread(new Runnable() {
@Override public void run() { @Override public void run() {
try { try {
latch.await(); keepAliveLatch.await();
} catch (InterruptedException e) { } catch (InterruptedException e) {
// bail out // bail out
} }