diff options
Diffstat (limited to 'logserver')
-rw-r--r-- | logserver/pom.xml | 5 | ||||
-rw-r--r-- | logserver/src/main/java/com/yahoo/logserver/Server.java | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/logserver/pom.xml b/logserver/pom.xml index be2d8ba4cee..1045b93185e 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -26,6 +26,11 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>yolean</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>vespalog</artifactId> <version>${project.version}</version> </dependency> diff --git a/logserver/src/main/java/com/yahoo/logserver/Server.java b/logserver/src/main/java/com/yahoo/logserver/Server.java index 36b1c3e31a0..d0df5bf2972 100644 --- a/logserver/src/main/java/com/yahoo/logserver/Server.java +++ b/logserver/src/main/java/com/yahoo/logserver/Server.java @@ -10,7 +10,7 @@ import com.yahoo.logserver.handlers.HandlerThread; import com.yahoo.logserver.handlers.LogHandler; import com.yahoo.logserver.net.LogConnectionFactory; import com.yahoo.logserver.net.control.Levels; -import com.yahoo.system.CatchSigTerm; +import com.yahoo.yolean.system.CatchSignals; import java.io.IOException; import java.util.HashMap; @@ -150,8 +150,8 @@ public class Server implements Runnable { } } - private void setupSigTermHandler() { - CatchSigTerm.setup(signalCaught); // catch termination signal + private void setupSignalHandler() { + CatchSignals.setup(signalCaught); // catch termination and interrupt signals } private void waitForShutdown() { @@ -191,7 +191,7 @@ public class Server implements Runnable { String portString = System.getProperty(APPNAME + ".listenport", LISTEN_PORT); Server server = Server.getInstance(); - server.setupSigTermHandler(); + server.setupSignalHandler(); server.initialize(Integer.parseInt(portString)); Thread t = new Thread(server, "logserver main"); |