Repository: logging-log4j2 Updated Branches: refs/heads/master a0f4f4db5 -> 2cc580f00
Release semaphore properly Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2cc580f0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2cc580f0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2cc580f0 Branch: refs/heads/master Commit: 2cc580f00e290a01048fce9868d5ae9fe906c881 Parents: a0f4f4d Author: Ralph Goers <[email protected]> Authored: Tue Jan 24 18:59:43 2017 -0700 Committer: Ralph Goers <[email protected]> Committed: Tue Jan 24 18:59:43 2017 -0700 ---------------------------------------------------------------------- .../log4j/core/appender/rolling/RollingFileManager.java | 6 ++++-- .../log4j/core/appender/rolling/RollingAppenderSizeTest.java | 1 - log4j-core/src/test/resources/log4j-rolling-bzip2-lazy.xml | 2 +- log4j-core/src/test/resources/log4j-rolling-bzip2.xml | 2 +- log4j-core/src/test/resources/log4j-rolling-deflate-lazy.xml | 2 +- log4j-core/src/test/resources/log4j-rolling-deflate.xml | 2 +- log4j-core/src/test/resources/log4j-rolling-pack200-lazy.xml | 2 +- log4j-core/src/test/resources/log4j-rolling-pack200.xml | 2 +- log4j-core/src/test/resources/log4j-rolling-xz-lazy.xml | 2 +- log4j-core/src/test/resources/log4j-rolling-xz.xml | 2 +- log4j-core/src/test/resources/log4j-rolling-zip-lazy.xml | 2 +- log4j-core/src/test/resources/log4j-rolling-zip.xml | 2 +- 12 files changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cc580f0/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 1e5f1ea..5205cf8 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 @@ -345,16 +345,17 @@ public class RollingFileManager extends FileManager { private boolean rollover(final RolloverStrategy strategy) { + boolean releaseRequired = false; try { // Block until the asynchronous operation is completed. semaphore.acquire(); + releaseRequired = true; } catch (final InterruptedException e) { logError("Thread interrupted while attempting to check rollover", e); return false; } boolean success = true; - Thread thread = null; try { final RolloverDescription descriptor = strategy.rollover(this); @@ -374,12 +375,13 @@ public class RollingFileManager extends FileManager { if (success && descriptor.getAsynchronous() != null) { LOGGER.debug("RollingFileManager executing async {}", descriptor.getAsynchronous()); asyncExecutor.execute(new AsyncAction(descriptor.getAsynchronous(), this)); + releaseRequired = false; } return true; } return false; } finally { - if (thread == null || !thread.isAlive()) { + if (releaseRequired) { semaphore.release(); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cc580f0/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java index 5b6f80e..cba8394 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java @@ -132,7 +132,6 @@ public class RollingAppenderSizeTest { } for (int i = 0; i < 500; ++i) { logger.debug("This is test message number " + i); - Thread.sleep(1); } try { Thread.sleep(100); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cc580f0/log4j-core/src/test/resources/log4j-rolling-bzip2-lazy.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-bzip2-lazy.xml b/log4j-core/src/test/resources/log4j-rolling-bzip2-lazy.xml index cdbd9b5..03ad0a7 100644 --- a/log4j-core/src/test/resources/log4j-rolling-bzip2-lazy.xml +++ b/log4j-core/src/test/resources/log4j-rolling-bzip2-lazy.xml @@ -32,7 +32,7 @@ <PatternLayout> <Pattern>%d %p %C{1.} [%t] %m%n</Pattern> </PatternLayout> - <SizeBasedTriggeringPolicy size="2000" /> + <SizeBasedTriggeringPolicy size="500" /> <DefaultRolloverStrategy compressionLevel="9" /> </RollingFile> <List name="List"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cc580f0/log4j-core/src/test/resources/log4j-rolling-bzip2.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-bzip2.xml b/log4j-core/src/test/resources/log4j-rolling-bzip2.xml index df38672..2b08005 100644 --- a/log4j-core/src/test/resources/log4j-rolling-bzip2.xml +++ b/log4j-core/src/test/resources/log4j-rolling-bzip2.xml @@ -31,7 +31,7 @@ <PatternLayout> <Pattern>%d %p %C{1.} [%t] %m%n</Pattern> </PatternLayout> - <SizeBasedTriggeringPolicy size="2000" /> + <SizeBasedTriggeringPolicy size="500" /> <DefaultRolloverStrategy compressionLevel="9" /> </RollingFile> <List name="List"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cc580f0/log4j-core/src/test/resources/log4j-rolling-deflate-lazy.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-deflate-lazy.xml b/log4j-core/src/test/resources/log4j-rolling-deflate-lazy.xml index edaa321..584c40f 100644 --- a/log4j-core/src/test/resources/log4j-rolling-deflate-lazy.xml +++ b/log4j-core/src/test/resources/log4j-rolling-deflate-lazy.xml @@ -32,7 +32,7 @@ <PatternLayout> <Pattern>%d %p %C{1.} [%t] %m%n</Pattern> </PatternLayout> - <SizeBasedTriggeringPolicy size="5000" /> + <SizeBasedTriggeringPolicy size="200" /> <DefaultRolloverStrategy compressionLevel="9" /> </RollingFile> <List name="List"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cc580f0/log4j-core/src/test/resources/log4j-rolling-deflate.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-deflate.xml b/log4j-core/src/test/resources/log4j-rolling-deflate.xml index 1a5c561..2c331e2 100644 --- a/log4j-core/src/test/resources/log4j-rolling-deflate.xml +++ b/log4j-core/src/test/resources/log4j-rolling-deflate.xml @@ -31,7 +31,7 @@ <PatternLayout> <Pattern>%d %p %C{1.} [%t] %m%n</Pattern> </PatternLayout> - <SizeBasedTriggeringPolicy size="5000" /> + <SizeBasedTriggeringPolicy size="200" /> <DefaultRolloverStrategy compressionLevel="9" /> </RollingFile> <List name="List"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cc580f0/log4j-core/src/test/resources/log4j-rolling-pack200-lazy.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-pack200-lazy.xml b/log4j-core/src/test/resources/log4j-rolling-pack200-lazy.xml index 52792c5..01016c1 100644 --- a/log4j-core/src/test/resources/log4j-rolling-pack200-lazy.xml +++ b/log4j-core/src/test/resources/log4j-rolling-pack200-lazy.xml @@ -32,7 +32,7 @@ <PatternLayout> <Pattern>%d %p %C{1.} [%t] %m%n</Pattern> </PatternLayout> - <SizeBasedTriggeringPolicy size="2000" /> + <SizeBasedTriggeringPolicy size="500" /> <DefaultRolloverStrategy compressionLevel="9" /> </RollingFile> <List name="List"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cc580f0/log4j-core/src/test/resources/log4j-rolling-pack200.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-pack200.xml b/log4j-core/src/test/resources/log4j-rolling-pack200.xml index 4a31c04..15a4cee 100644 --- a/log4j-core/src/test/resources/log4j-rolling-pack200.xml +++ b/log4j-core/src/test/resources/log4j-rolling-pack200.xml @@ -31,7 +31,7 @@ <PatternLayout> <Pattern>%d %p %C{1.} [%t] %m%n</Pattern> </PatternLayout> - <SizeBasedTriggeringPolicy size="2000" /> + <SizeBasedTriggeringPolicy size="500" /> <DefaultRolloverStrategy compressionLevel="9" /> </RollingFile> <List name="List"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cc580f0/log4j-core/src/test/resources/log4j-rolling-xz-lazy.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-xz-lazy.xml b/log4j-core/src/test/resources/log4j-rolling-xz-lazy.xml index 5d01723..b87ef4a 100644 --- a/log4j-core/src/test/resources/log4j-rolling-xz-lazy.xml +++ b/log4j-core/src/test/resources/log4j-rolling-xz-lazy.xml @@ -32,7 +32,7 @@ <PatternLayout> <Pattern>%d %p %C{1.} [%t] %m%n</Pattern> </PatternLayout> - <SizeBasedTriggeringPolicy size="2000" /> + <SizeBasedTriggeringPolicy size="500" /> <DefaultRolloverStrategy compressionLevel="9" /> </RollingFile> <List name="List"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cc580f0/log4j-core/src/test/resources/log4j-rolling-xz.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-xz.xml b/log4j-core/src/test/resources/log4j-rolling-xz.xml index 70673da..07063b2 100644 --- a/log4j-core/src/test/resources/log4j-rolling-xz.xml +++ b/log4j-core/src/test/resources/log4j-rolling-xz.xml @@ -31,7 +31,7 @@ <PatternLayout> <Pattern>%d %p %C{1.} [%t] %m%n</Pattern> </PatternLayout> - <SizeBasedTriggeringPolicy size="2000" /> + <SizeBasedTriggeringPolicy size="500" /> <DefaultRolloverStrategy compressionLevel="9" /> </RollingFile> <List name="List"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cc580f0/log4j-core/src/test/resources/log4j-rolling-zip-lazy.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-zip-lazy.xml b/log4j-core/src/test/resources/log4j-rolling-zip-lazy.xml index 11389b1..437221c 100644 --- a/log4j-core/src/test/resources/log4j-rolling-zip-lazy.xml +++ b/log4j-core/src/test/resources/log4j-rolling-zip-lazy.xml @@ -32,7 +32,7 @@ <PatternLayout> <Pattern>%d %p %C{1.} [%t] %m%n</Pattern> </PatternLayout> - <SizeBasedTriggeringPolicy size="2000" /> + <SizeBasedTriggeringPolicy size="500" /> <DefaultRolloverStrategy compressionLevel="9" /> </RollingFile> <List name="List"> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2cc580f0/log4j-core/src/test/resources/log4j-rolling-zip.xml ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/resources/log4j-rolling-zip.xml b/log4j-core/src/test/resources/log4j-rolling-zip.xml index ed031e3..7f8d96e 100644 --- a/log4j-core/src/test/resources/log4j-rolling-zip.xml +++ b/log4j-core/src/test/resources/log4j-rolling-zip.xml @@ -31,7 +31,7 @@ <PatternLayout> <Pattern>%d %p %C{1.} [%t] %m%n</Pattern> </PatternLayout> - <SizeBasedTriggeringPolicy size="2000" /> + <SizeBasedTriggeringPolicy size="500" /> <DefaultRolloverStrategy compressionLevel="9" /> </RollingFile> <List name="List">
