You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/08/22 06:03:28 UTC
[4/7] logging-log4j2 git commit: Use scale in name.
Use scale in 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/7c7d563a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7c7d563a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7c7d563a
Branch: refs/heads/master
Commit: 7c7d563a71dd76b59e80c1cb3deada10a3d851d7
Parents: abc9ad3
Author: ggregory <gg...@apache.org>
Authored: Fri Aug 21 20:51:04 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Fri Aug 21 20:51:04 2015 -0700
----------------------------------------------------------------------
.../core/appender/rolling/TimeBasedTriggeringPolicy.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c7d563a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
index cbd605e..e203e68 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.core.util.Integers;
@Plugin(name = "TimeBasedTriggeringPolicy", category = "Core", printObject = true)
public final class TimeBasedTriggeringPolicy implements TriggeringPolicy {
- private long nextRollover;
+ private long nextRolloverMillis;
private final int interval;
private final boolean modulate;
@@ -50,7 +50,7 @@ public final class TimeBasedTriggeringPolicy implements TriggeringPolicy {
// LOG4J2-531: call getNextTime twice to force initialization of both prevFileTime and nextFileTime
manager.getPatternProcessor().getNextTime(manager.getFileTime(), interval, modulate);
- nextRollover = manager.getPatternProcessor().getNextTime(manager.getFileTime(), interval, modulate);
+ nextRolloverMillis = manager.getPatternProcessor().getNextTime(manager.getFileTime(), interval, modulate);
}
/**
@@ -63,9 +63,9 @@ public final class TimeBasedTriggeringPolicy implements TriggeringPolicy {
if (manager.getFileSize() == 0) {
return false;
}
- final long now = event.getTimeMillis();
- if (now > nextRollover) {
- nextRollover = manager.getPatternProcessor().getNextTime(now, interval, modulate);
+ final long nowMillis = event.getTimeMillis();
+ if (nowMillis > nextRolloverMillis) {
+ nextRolloverMillis = manager.getPatternProcessor().getNextTime(nowMillis, interval, modulate);
return true;
}
return false;