diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-10 14:33:31 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-10 14:33:31 +0200 |
commit | 81d8944b401069cf034df9c8045000a87ccb1e98 (patch) | |
tree | cd168e250c1b5421fa86d6b9debe6fb5976b8049 /container-accesslogging | |
parent | a6fef2f8eee0f030217d641d5034eb4c30c5c512 (diff) |
Properly shutdown the executor service.
Diffstat (limited to 'container-accesslogging')
-rw-r--r-- | container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java index 36f2a331aa2..33896c870a5 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java @@ -14,7 +14,7 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.logging.Level; @@ -51,7 +51,7 @@ public class LogFileHandler extends StreamHandler { private String symlinkName = null; private ArrayBlockingQueue<LogRecord> logQueue = new ArrayBlockingQueue<>(100000); private LogRecord rotateCmd = new LogRecord(Level.SEVERE, "rotateNow"); - private Executor executor = Executors.newCachedThreadPool(ThreadFactoryFactory.getDaemonThreadFactory("logfilehandler.compression")); + private ExecutorService executor = Executors.newCachedThreadPool(ThreadFactoryFactory.getDaemonThreadFactory("logfilehandler.compression")); static private class LogThread extends Thread { LogFileHandler logFileHandler; @@ -412,7 +412,8 @@ public class LogFileHandler extends StreamHandler { logThread.interrupt(); try { logThread.join(); - executor. + executor.shutdown(); + executor.awaitTermination(600, TimeUnit.SECONDS); } catch (InterruptedException e) { } |