Repository: logging-log4j2 Updated Branches: refs/heads/master b569d1d7b -> 6f4620a0c
Refactor ExecutorService shutdown into a class for reuse. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6f4620a0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6f4620a0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6f4620a0 Branch: refs/heads/master Commit: 6f4620a0c814d58fac5220a3d0f3367a805c12d3 Parents: b569d1d Author: Gary Gregory <[email protected]> Authored: Mon Sep 5 17:40:53 2016 -0400 Committer: Gary Gregory <[email protected]> Committed: Mon Sep 5 17:40:53 2016 -0400 ---------------------------------------------------------------------- .../logging/log4j/flume/appender/FlumePersistentManager.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6f4620a0/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java index bc591c2..0f6497b 100644 --- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java +++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java @@ -44,6 +44,7 @@ import org.apache.logging.log4j.core.appender.ManagerFactory; import org.apache.logging.log4j.core.config.Property; import org.apache.logging.log4j.core.config.plugins.util.PluginManager; import org.apache.logging.log4j.core.config.plugins.util.PluginType; +import org.apache.logging.log4j.core.util.ExecutorServices; import org.apache.logging.log4j.core.util.FileUtils; import org.apache.logging.log4j.core.util.Log4jThread; import org.apache.logging.log4j.core.util.Log4jThreadFactory; @@ -224,12 +225,7 @@ public class FlumePersistentManager extends FlumeAvroManager { } catch (final InterruptedException ie) { // Ignore the exception and shutdown. } - threadPool.shutdown(); - try { - threadPool.awaitTermination(SHUTDOWN_WAIT_SECONDS, TimeUnit.SECONDS); - } catch (final InterruptedException e) { - logWarn("PersistentManager Thread pool failed to shut down", e); - } + ExecutorServices.shutdown(threadPool, SHUTDOWN_WAIT_SECONDS, TimeUnit.SECONDS, toString()); try { worker.join(); } catch (final InterruptedException ex) {
