LOG4J2-1748 revert some changes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e390ad36 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e390ad36 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e390ad36 Branch: refs/heads/LOG4J2-1748and1780-remove-ExecutorService-from-LoggerContext Commit: e390ad368f5549c2415856d9176a0cf32c2ced40 Parents: e21a07e Author: Mikael Ståldal <[email protected]> Authored: Sun Jan 15 16:29:31 2017 +0100 Committer: Mikael Ståldal <[email protected]> Committed: Sun Jan 15 16:30:20 2017 +0100 ---------------------------------------------------------------------- .../appender/rolling/RollingFileManager.java | 1 - .../core/config/ConfigurationScheduler.java | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e390ad36/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java index 22ce948..d32c726 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; import java.nio.ByteBuffer; -import java.util.concurrent.Future; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e390ad36/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java index 03723c8..f1e21e4 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java @@ -187,13 +187,18 @@ public class ConfigurationScheduler extends AbstractLifeCycle { private ScheduledExecutorService getExecutorService() { if (executorService == null) { - LOGGER.debug("{} starting {} threads", SIMPLE_NAME, scheduledItems); - scheduledItems = Math.min(scheduledItems, MAX_SCHEDULED_ITEMS); - ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(scheduledItems + 1, - Log4jThreadFactory.createDaemonThreadFactory("Scheduled")); - executor.setContinueExistingPeriodicTasksAfterShutdownPolicy(false); - executor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); - this.executorService = executor; + if (scheduledItems > 0) { + LOGGER.debug("{} starting {} threads", SIMPLE_NAME, scheduledItems); + scheduledItems = Math.min(scheduledItems, MAX_SCHEDULED_ITEMS); + ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(scheduledItems, + Log4jThreadFactory.createDaemonThreadFactory("Scheduled")); + executor.setContinueExistingPeriodicTasksAfterShutdownPolicy(false); + executor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); + this.executorService = executor; + + } else { + LOGGER.debug("{}: No scheduled items", SIMPLE_NAME); + } } return executorService; }
