diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-03-29 12:52:00 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-03-29 12:52:00 +0100 |
commit | 9ae49b67e47aa2f0c5e1c7b326aad9c9236fa150 (patch) | |
tree | cff0de939dad2c5d85d526b70a0ab5a2114052ab /vespalog/src/main/java/com | |
parent | d961a004fa0b93a598d7aa958d12d710eeb87c23 (diff) |
Increase number of decimals in log timestamp from 3 to 6
Diffstat (limited to 'vespalog/src/main/java/com')
-rw-r--r-- | vespalog/src/main/java/com/yahoo/log/VespaFormat.java | 27 | ||||
-rw-r--r-- | vespalog/src/main/java/com/yahoo/log/VespaFormatter.java | 6 |
2 files changed, 11 insertions, 22 deletions
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaFormat.java b/vespalog/src/main/java/com/yahoo/log/VespaFormat.java index 3d1a2ae0dc8..d0dc5607af5 100644 --- a/vespalog/src/main/java/com/yahoo/log/VespaFormat.java +++ b/vespalog/src/main/java/com/yahoo/log/VespaFormat.java @@ -11,6 +11,7 @@ import java.util.regex.Pattern; * written by Bjørn Borud, licensed under the Apache 2.0 license. * * @author arnej27959 + * @author bjorncs */ public class VespaFormat { @@ -87,31 +88,18 @@ public class VespaFormat { /** - * It is easier to slice and dice strings in Java than formatting - * numbers... + * @deprecated Use {@link #formatTime(Instant)} ()} */ + @Deprecated(since = "7", forRemoval = true) public static void formatTime (long time, StringBuilder sbuffer) { - String timeString = Long.toString(time); - int len = timeString.length(); - - // something wrong. handle it by just returning the input - // long as a string. we prefer this to just crashing in - // the substring handling. - if (len < 3) { - sbuffer.append(timeString); - return; - } - sbuffer.append(timeString.substring(0, len - 3)); - sbuffer.append('.'); - sbuffer.append(timeString.substring(len - 3)); + sbuffer.append(formatTime(Instant.ofEpochMilli(time))); } - static String formatTime(Instant instant) { - StringBuilder builder = new StringBuilder(); - VespaFormat.formatTime(instant.toEpochMilli(), builder); - return builder.toString(); + public static String formatTime(Instant instant) { + return String.format("%d.%06d", instant.getEpochSecond(), instant.getNano() / 1000); } + @Deprecated(since = "7", forRemoval = true) // Unused - this is not the format used by the Vespa log handler public static String format(String levelName, String component, String componentPrefix, @@ -165,6 +153,7 @@ public class VespaFormat { * @param sbuf The stringbuffer into which we wish to * format the Throwable */ + @Deprecated(since = "7", forRemoval = true) // Unused - this is not the format used by the Vespa log handler public static void formatException (Throwable t, StringBuilder sbuf) { Throwable last = t; int depth = 0; diff --git a/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java b/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java index 9db9fd09b26..72a80227138 100644 --- a/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java +++ b/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java @@ -2,6 +2,8 @@ // $Id$ package com.yahoo.log; +import com.yahoo.log.event.Event; + import java.io.PrintWriter; import java.io.StringWriter; import java.util.logging.LogRecord; @@ -9,8 +11,6 @@ import java.util.logging.SimpleFormatter; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.yahoo.log.event.Event; - /** * This class implements a log formatter which takes care of * formatting messages according to the VESPA common log format. @@ -98,7 +98,7 @@ public class VespaFormatter extends SimpleFormatter { String component = r.getLoggerName(); // format the time - VespaFormat.formatTime(r.getMillis(), sbuf); + sbuf.append(VespaFormat.formatTime(r.getInstant())); sbuf.append("\t"); sbuf.append(hostname).append("\t") |