You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/07 13:18:43 UTC
[07/38] logging-log4j2 git commit: Better constant name.
Better constant name.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fd0320ee
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fd0320ee
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fd0320ee
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: fd0320ee62864757719775b407ec3019e714c1c0
Parents: 9e3ba65
Author: Gary Gregory <gg...@apache.org>
Authored: Wed Aug 3 12:07:29 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Wed Aug 3 12:07:29 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/flume/appender/FlumePersistentManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fd0320ee/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 8a83ca7..4877ec5 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
@@ -74,7 +74,7 @@ public class FlumePersistentManager extends FlumeAvroManager {
private static final String DEFAULT_DATA_DIR = ".log4j/flumeData";
- private static final int SHUTDOWN_WAIT = 60;
+ private static final int SHUTDOWN_WAIT_SECONDS = 60;
private static final int MILLIS_PER_SECOND = 1000;
@@ -221,13 +221,13 @@ public class FlumePersistentManager extends FlumeAvroManager {
LOGGER.debug("Shutting down FlumePersistentManager");
worker.shutdown();
try {
- worker.join(SHUTDOWN_WAIT * MILLIS_PER_SECOND);
+ worker.join(SHUTDOWN_WAIT_SECONDS * MILLIS_PER_SECOND);
} catch (final InterruptedException ie) {
// Ignore the exception and shutdown.
}
threadPool.shutdown();
try {
- threadPool.awaitTermination(SHUTDOWN_WAIT, TimeUnit.SECONDS);
+ threadPool.awaitTermination(SHUTDOWN_WAIT_SECONDS, TimeUnit.SECONDS);
} catch (final InterruptedException e) {
logWarn("PersistentManager Thread pool failed to shut down", e);
}