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/07/09 09:02:12 UTC
logging-log4j2 git commit: Use time scale (millis) in var names.
Repository: logging-log4j2
Updated Branches:
refs/heads/master e57a4717d -> fbf3c0383
Use time scale (millis) in var names.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fbf3c038
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fbf3c038
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fbf3c038
Branch: refs/heads/master
Commit: fbf3c0383e6d6354b0a56cb96c2141185c1cb97c
Parents: e57a471
Author: ggregory <gg...@apache.org>
Authored: Thu Jul 9 00:02:08 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Thu Jul 9 00:02:08 2015 -0700
----------------------------------------------------------------------
.../core/pattern/DatePatternConverter.java | 28 ++++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fbf3c038/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
index 52ea93b..8a93cbb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/DatePatternConverter.java
@@ -32,19 +32,19 @@ import org.apache.logging.log4j.core.util.datetime.FastDateFormat;
public final class DatePatternConverter extends LogEventPatternConverter implements ArrayPatternConverter {
private class CurrentTime {
- public long timestamp;
+ public long timestampMillis;
public String formatted;
- public CurrentTime(long timestamp) {
- this.timestamp = timestamp;
- this.formatted = formatter.format(this.timestamp);
+ public CurrentTime(long timestampMillis) {
+ this.timestampMillis = timestampMillis;
+ this.formatted = formatter.format(this.timestampMillis);
}
}
private AtomicReference<CurrentTime> currentTime;
private abstract static class Formatter {
- abstract String format(long time);
+ abstract String format(long timeMillis);
public String toPattern() {
return null;
@@ -59,8 +59,8 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
}
@Override
- String format(final long time) {
- return fastDateFormat.format(time);
+ String format(final long timeMillis) {
+ return fastDateFormat.format(timeMillis);
}
@Override
@@ -72,8 +72,8 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
private static class UnixFormatter extends Formatter {
@Override
- String format(final long time) {
- return Long.toString(time / 1000);
+ String format(final long timeMillis) {
+ return Long.toString(timeMillis / 1000);
}
}
@@ -81,8 +81,8 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
private static class UnixMillisFormatter extends Formatter {
@Override
- String format(final long time) {
- return Long.toString(time);
+ String format(final long timeMillis) {
+ return Long.toString(timeMillis);
}
}
@@ -251,10 +251,10 @@ public final class DatePatternConverter extends LogEventPatternConverter impleme
*/
@Override
public void format(final LogEvent event, final StringBuilder output) {
- final long timestamp = event.getTimeMillis();
+ final long timestampMillis = event.getTimeMillis();
CurrentTime current = currentTime.get();
- if (timestamp != current.timestamp) {
- final CurrentTime newTime = new CurrentTime(timestamp);
+ if (timestampMillis != current.timestampMillis) {
+ final CurrentTime newTime = new CurrentTime(timestampMillis);
if (currentTime.compareAndSet(current, newTime)) {
current = newTime;
} else {