LOG4J2-435 improved status message Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b87e4c74 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b87e4c74 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b87e4c74
Branch: refs/heads/LOG4J-1181 Commit: b87e4c740cabf44684a6a24a47a268ff2e797638 Parents: bb4b625 Author: rpopma <[email protected]> Authored: Sun Nov 29 15:25:34 2015 +0900 Committer: rpopma <[email protected]> Committed: Sun Nov 29 15:25:34 2015 +0900 ---------------------------------------------------------------------- .../log4j/core/appender/rolling/action/IfAccumulatedFileCount.java | 2 +- .../log4j/core/appender/rolling/action/IfAccumulatedFileSize.java | 2 +- .../logging/log4j/core/appender/rolling/action/IfFileName.java | 2 +- .../logging/log4j/core/appender/rolling/action/IfLastModified.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b87e4c74/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java index ed56321..b70dc26 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java @@ -66,7 +66,7 @@ public final class IfAccumulatedFileCount implements PathCondition { public boolean accept(final Path basePath, final Path relativePath, final BasicFileAttributes attrs) { final boolean result = ++count > threshold; final String match = result ? ">" : "<="; - final String accept = result ? "ACCEPT" : "REJECT"; + final String accept = result ? "ACCEPTED" : "REJECTED"; LOGGER.trace("IfAccumulatedFileCount {}: {} count '{}' {} threshold '{}'", accept, relativePath, count, match, threshold); if (result) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b87e4c74/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java index 46714ca..bcf543a 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java @@ -68,7 +68,7 @@ public final class IfAccumulatedFileSize implements PathCondition { accumulatedSize += attrs.size(); final boolean result = accumulatedSize > thresholdBytes; final String match = result ? ">" : "<="; - final String accept = result ? "ACCEPT" : "REJECT"; + final String accept = result ? "ACCEPTED" : "REJECTED"; LOGGER.trace("IfAccumulatedFileSize {}: {} accumulated size '{}' {} thresholdBytes '{}'", accept, relativePath, accumulatedSize, match, thresholdBytes); if (result) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b87e4c74/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java index c1260f2..ad958e4 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java @@ -101,7 +101,7 @@ public final class IfFileName implements PathCondition { final boolean result = pathMatcher.matches(relativePath); final String match = result ? "matches" : "does not match"; - final String accept = result ? "ACCEPT" : "REJECT"; + final String accept = result ? "ACCEPTED" : "REJECTED"; LOGGER.trace("IfFileName {}: '{}' {} relative path '{}'", accept, syntaxAndPattern, match, relativePath); if (result) { return IfAll.accept(nestedConditions, basePath, relativePath, attrs); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b87e4c74/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java index 17a3861..a3956c1 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java @@ -71,7 +71,7 @@ public final class IfLastModified implements PathCondition { final long ageMillis = CLOCK.currentTimeMillis() - millis; final boolean result = ageMillis >= age.toMillis(); final String match = result ? ">=" : "<"; - final String accept = result ? "ACCEPT" : "REJECT"; + final String accept = result ? "ACCEPTED" : "REJECTED"; LOGGER.trace("IfLastModified {}: {} ageMillis '{}' {} '{}'", accept, relativePath, ageMillis, match, age); if (result) { return IfAll.accept(nestedConditions, basePath, relativePath, attrs);
