From 963f0f0f5ff2dfff5fda850d1f986fbf38e5cafc Mon Sep 17 00:00:00 2001 From: 0xb00bface <0xboobface@gmail.com> Date: Sun, 26 Jul 2020 15:14:44 +0200 Subject: [PATCH] Change order how things are shutdown --- .../main/java/ctbrec/recorder/NextGenLocalRecorder.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java b/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java index c2d94fa0..46b4bc84 100644 --- a/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java +++ b/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java @@ -456,7 +456,7 @@ public class NextGenLocalRecorder implements Recorder { recorderLock.unlock(); } - // wait for post-processing to finish + // wait for downloads to finish LOG.info("Waiting for downloads to finish"); for (int i = 0; i < 60; i++) { if (!recordingProcesses.isEmpty()) { @@ -471,11 +471,12 @@ public class NextGenLocalRecorder implements Recorder { // shutdown threadpools try { - LOG.info("Shutting down pools"); + LOG.info("Shutting down download pool"); downloadPool.shutdown(); - ppPool.shutdown(); client.shutdown(); downloadPool.awaitTermination(1, TimeUnit.MINUTES); + LOG.info("Shutting down post-processing pool"); + ppPool.shutdown(); int minutesToWait = 10; LOG.info("Waiting {} minutes (max) for post-processing to finish", minutesToWait); ppPool.awaitTermination(minutesToWait, TimeUnit.MINUTES);