From 99894f9acd3c43b3f25882959144b525c8bc85d4 Mon Sep 17 00:00:00 2001 From: Isaac Parenteau Date: Sat, 15 Sep 2018 16:00:51 -0500 Subject: [PATCH] Fixed an issue on how loggers are initialized --- .../net/locusworks/logger/ApplicationLogger.java | 14 +++++++++----- .../logger/ApplicationLoggerFactory.java | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/locusworks/logger/ApplicationLogger.java b/src/main/java/net/locusworks/logger/ApplicationLogger.java index 361cf77..5761eb7 100644 --- a/src/main/java/net/locusworks/logger/ApplicationLogger.java +++ b/src/main/java/net/locusworks/logger/ApplicationLogger.java @@ -516,16 +516,20 @@ public class ApplicationLogger implements org.slf4j.Logger { switch (level) { case ALL: case TRACE: + logger.trace(format(message, level)); + break; case DEBUG: + logger.debug(format(message, level)); + break; case INFO: - logger.info(format(message)); + logger.info(format(message, level)); break; case WARN: - logger.warn(format(message)); + logger.warn(format(message, level)); break; case ERROR: case FATAL: - logger.error(format(message)); + logger.error(format(message, level)); break; case OFF: default: @@ -615,7 +619,7 @@ public class ApplicationLogger implements org.slf4j.Logger { * @param message the message to log * @return the formatted string */ - private String format(String message) { - return String.format("th%06d [%-5s] [%s] %s", Thread.currentThread().getId(), this.level.name(), this.name, message); + private String format(String message, LogLevel level) { + return String.format("th%06d [%-5s] [%s] %s", Thread.currentThread().getId(), level, this.name, message); } } \ No newline at end of file diff --git a/src/main/java/net/locusworks/logger/ApplicationLoggerFactory.java b/src/main/java/net/locusworks/logger/ApplicationLoggerFactory.java index 742f04b..46b8929 100644 --- a/src/main/java/net/locusworks/logger/ApplicationLoggerFactory.java +++ b/src/main/java/net/locusworks/logger/ApplicationLoggerFactory.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; */ public class ApplicationLoggerFactory { private static Map loggers = new TreeMap<>(); - private static LogLevel DEFAULT_LEVEL = null; + private static LogLevel DEFAULT_LEVEL = LogLevel.ALL; private static ApplicationLoggerInitializer initializer; /**