summaryrefslogtreecommitdiffstats
path: root/jdisc_core
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@verizonmedia.com>2019-01-27 19:54:20 +0100
committerHåkon Hallingstad <hakon@verizonmedia.com>2019-01-27 19:54:20 +0100
commit04221b18021faeb53754b4cec538307b62c9d558 (patch)
tree06727157e739d6406f2d3486c3710d6cc02984ee /jdisc_core
parent8e700d0078e1015756a23781efc461913dc87419 (diff)
Terminate standalone container cleanly on SIGINT/control-C
Diffstat (limited to 'jdisc_core')
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java
index 1291418083b..770c59dec35 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java
@@ -1,7 +1,7 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.jdisc.core;
-import com.yahoo.yolean.system.CatchSigTerm;
+import com.yahoo.yolean.system.CatchSignals;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -41,7 +41,7 @@ public class StandaloneMain {
System.out.println("debug\tInitializing application without privileges.");
loader.init(bundleLocation, false);
loader.start();
- setupSigTermHandler();
+ setupSignalHandlers();
waitForShutdown();
System.out.println("debug\tTrying to shutdown in a controlled manner.");
log.log(Level.INFO, "JDisc shutting down");
@@ -59,8 +59,8 @@ public class StandaloneMain {
}
private final AtomicBoolean signalCaught = new AtomicBoolean(false);
- private void setupSigTermHandler() {
- CatchSigTerm.setup(signalCaught); // catch termination signal
+ private void setupSignalHandlers() {
+ CatchSignals.setup(signalCaught);
}
private void waitForShutdown() {
synchronized (signalCaught) {