Merge pull request #1 from avaje/feature/format-timestamp

Change property name to logger.format from logger.writer

Author: rbygrave

avaje-simple-json-logger/src/main/java/io/avaje/simplelogger/encoder/Bootstrap.java

@@ -16,8 +16,7 @@ public final class Bootstrap {
 
   public static LoggerContext init() {
     Properties properties = loadProperties();
-    String writerType = properties.getProperty("logger.writer", "json");
-    LogWriter logWriter = createWriter(properties, writerType);
+    LogWriter logWriter = createWriter(properties, logFormat(properties));
 
     String info = properties.getProperty("logger.defaultLogLevel", "info");
     int defaultLevel = SimpleLoggerFactory.stringToLevel(info);
@@ -29,6 +28,10 @@ public static LoggerContext init() {
     return new SimpleLoggerFactory(logWriter, abbreviator, defaultLevel, nameLevels);
   }
 
+  private static String logFormat(Properties properties) {
+    return properties.getProperty("logger.format", "json");
+  }
+
   private static Map<String, String> initialNameLevels(Properties properties) {
     Map<String, String> nameLevels = new HashMap<>();
     for (String key : properties.stringPropertyNames()) {
@@ -47,8 +50,8 @@ private static LogWriter createWriter(Properties properties, String writerType)
     final TimeZone timeZone = TimeZoneUtils.parseTimeZone(property(properties, "logger.timezone"));
     final String timestampPattern = property(properties, "logger.timestampPattern");
     if ("plain".equalsIgnoreCase(writerType)) {
-      final DateTimeFormatter formatter = TimeZoneUtils.formatter(timestampPattern, timeZone.toZoneId());
-      final boolean showThreadName = Boolean.parseBoolean(Eval.eval(properties.getProperty("logger.showThreadName")));
+      final DateTimeFormatter formatter = TimeZoneUtils.plainFormatter(timestampPattern, timeZone.toZoneId());
+      final boolean showThreadName = propertyShowThreadName(properties);
       return new PlainLogWriter(target, formatter, showThreadName);
     }
     var jsonEncoder = new JsonEncoderBuilder()
@@ -65,6 +68,10 @@ private static String property(Properties properties, String key) {
     return Eval.eval(properties.getProperty(key));
   }
 
+  private static boolean propertyShowThreadName(Properties properties) {
+    return Boolean.parseBoolean(Eval.eval(properties.getProperty("logger.showThreadName", "true")));
+  }
+
   private static Properties loadProperties() {
     final var properties = new Properties();
     load(properties, "avaje-logger.properties");

avaje-simple-json-logger/src/main/java/io/avaje/simplelogger/encoder/JsonEncoder.java

@@ -7,7 +7,7 @@
 import org.slf4j.helpers.MessageFormatter;
 
 import java.io.ByteArrayOutputStream;
-import java.time.Instant;
+import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Map;
 
@@ -63,10 +63,10 @@ byte[] encode(String loggerName, Level level, String messagePattern, Object[] ar
         writer.value(environment);
       }
       writer.name(2);
-      writer.value(formatter.format(Instant.now()));
+      writer.value(formatter.format(OffsetDateTime.now()));
       writer.name(3);
       writer.value(level.toString());
-      writer.name(4);//
+      writer.name(4);
       writer.value(loggerName);
       writer.name(5);
       writer.value(message);

avaje-simple-json-logger/src/main/java/io/avaje/simplelogger/encoder/JsonEncoderBuilder.java

@@ -96,8 +96,7 @@ JsonEncoder build() {
     if (stackHasher == null) {
       stackHasher = new StackHasher(StackElementFilter.builder().allFilters().build());
     }
-
-    final DateTimeFormatter formatter = TimeZoneUtils.formatter(timestampPattern, timeZone.toZoneId());
+    final DateTimeFormatter formatter = TimeZoneUtils.jsonFormatter(timestampPattern, timeZone.toZoneId());
     return new JsonEncoder(json, component, environment, stackHasher, formatter, includeStackHash, customFieldsMap, throwableConverter);
   }
 

avaje-simple-json-logger/src/main/java/io/avaje/simplelogger/encoder/TimeZoneUtils.java

@@ -44,11 +44,21 @@ static TimeZone parseTimeZone(String str) {
     return tz;
   }
 
-  static DateTimeFormatter formatter(String pattern, ZoneId zoneId) {
-    if (pattern == null) {
+  static DateTimeFormatter jsonFormatter(String timestampPattern, ZoneId zoneId) {
+    if (timestampPattern == null) {
       return DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(zoneId);
     }
+    return formatter(timestampPattern, zoneId);
+  }
+
+  static DateTimeFormatter plainFormatter(String timestampPattern, ZoneId zoneId) {
+    if (timestampPattern == null) {
+      return DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SSS");
+    }
+    return formatter(timestampPattern, zoneId);
+  }
 
+  private static DateTimeFormatter formatter(String pattern, ZoneId zoneId) {
     try {
       var time = TimePattern.valueOf(pattern.toUpperCase());
       switch (time) {

avaje-simple-json-logger/src/test/java/io/avaje/simplelogger/encoder/AcceptanceTest.java

@@ -13,7 +13,7 @@ public class AcceptanceTest extends LoggerTestSuite {
 
   @Override
   public Logger createLogger(ListAppendingOutputStream outputStream, Level level) {
-    final DateTimeFormatter formatter = TimeZoneUtils.formatter(null, TimeZone.getDefault().toZoneId());
+    final DateTimeFormatter formatter = TimeZoneUtils.jsonFormatter(null, TimeZone.getDefault().toZoneId());
     int logLevel = SimpleLoggerFactory.stringToLevel(level.toString());
     return new SimpleLogger(new PlainLogWriter(System.out, formatter, true), "TestSuiteLogger", "TestSuiteLogger", logLevel);
   }

avaje-simple-json-logger/src/test/resources/avaje-logger-test.properties

@@ -1,4 +1,4 @@
-logger.writer=plain
+logger.format=plain
 
 # values - full, short, <int target length>
 #logger.nameTargetLength=full