diff --git a/commons-logger/src/main/java/io/gitlab/jfronny/commons/logger/CommonsLogger.java b/commons-logger/src/main/java/io/gitlab/jfronny/commons/logger/CommonsLogger.java deleted file mode 100644 index 4ac5f49..0000000 --- a/commons-logger/src/main/java/io/gitlab/jfronny/commons/logger/CommonsLogger.java +++ /dev/null @@ -1,315 +0,0 @@ -package io.gitlab.jfronny.commons.logger; - -import org.slf4j.Logger; -import org.slf4j.Marker; - -public record CommonsLogger(io.gitlab.jfronny.commons.logging.Logger delegate) implements Logger { - public CommonsLogger(String name) { - this(io.gitlab.jfronny.commons.logging.Logger.forName(name)); - } - - @Override - public String getName() { - return delegate.getName(); - } - - @Override - public boolean isTraceEnabled() { - return true; - } - - @Override - public void trace(String msg) { - delegate.trace(msg); - } - - @Override - public void trace(String format, Object arg) { - delegate.trace(format, arg); - } - - @Override - public void trace(String format, Object arg1, Object arg2) { - delegate.trace(format, arg1, arg2); - } - - @Override - public void trace(String format, Object... arguments) { - delegate.trace(format, arguments); - } - - @Override - public void trace(String msg, Throwable t) { - delegate.trace(msg, t); - } - - @Override - public boolean isTraceEnabled(Marker marker) { - return true; - } - - @Override - public void trace(Marker marker, String msg) { - delegate.trace(msg); - } - - @Override - public void trace(Marker marker, String format, Object arg) { - delegate.trace(format, arg); - } - - @Override - public void trace(Marker marker, String format, Object arg1, Object arg2) { - delegate.trace(format, arg1, arg2); - } - - @Override - public void trace(Marker marker, String format, Object... argArray) { - delegate.trace(format, argArray); - } - - @Override - public void trace(Marker marker, String msg, Throwable t) { - delegate.trace(msg, t); - } - - @Override - public boolean isDebugEnabled() { - return true; - } - - @Override - public void debug(String msg) { - delegate.debug(msg); - } - - @Override - public void debug(String format, Object arg) { - delegate.debug(format, arg); - } - - @Override - public void debug(String format, Object arg1, Object arg2) { - delegate.debug(format, arg1, arg2); - } - - @Override - public void debug(String format, Object... arguments) { - delegate.debug(format, arguments); - } - - @Override - public void debug(String msg, Throwable t) { - delegate.debug(msg, t); - } - - @Override - public boolean isDebugEnabled(Marker marker) { - return true; - } - - @Override - public void debug(Marker marker, String msg) { - delegate.debug(msg); - } - - @Override - public void debug(Marker marker, String format, Object arg) { - delegate.debug(format, arg); - } - - @Override - public void debug(Marker marker, String format, Object arg1, Object arg2) { - delegate.debug(format, arg1, arg2); - } - - @Override - public void debug(Marker marker, String format, Object... arguments) { - delegate.debug(format, arguments); - } - - @Override - public void debug(Marker marker, String msg, Throwable t) { - delegate.debug(msg, t); - } - - @Override - public boolean isInfoEnabled() { - return true; - } - - @Override - public void info(String msg) { - delegate.info(msg); - } - - @Override - public void info(String format, Object arg) { - delegate.info(format, arg); - } - - @Override - public void info(String format, Object arg1, Object arg2) { - delegate.info(format, arg1, arg2); - } - - @Override - public void info(String format, Object... arguments) { - delegate.info(format, arguments); - } - - @Override - public void info(String msg, Throwable t) { - delegate.info(msg, t); - } - - @Override - public boolean isInfoEnabled(Marker marker) { - return true; - } - - @Override - public void info(Marker marker, String msg) { - delegate.info(msg); - } - - @Override - public void info(Marker marker, String format, Object arg) { - delegate.info(format, arg); - } - - @Override - public void info(Marker marker, String format, Object arg1, Object arg2) { - delegate.info(format, arg1, arg2); - } - - @Override - public void info(Marker marker, String format, Object... arguments) { - delegate.info(format, arguments); - } - - @Override - public void info(Marker marker, String msg, Throwable t) { - delegate.info(msg, t); - } - - @Override - public boolean isWarnEnabled() { - return true; - } - - @Override - public void warn(String msg) { - delegate.warn(msg); - } - - @Override - public void warn(String format, Object arg) { - delegate.warn(format, arg); - } - - @Override - public void warn(String format, Object... arguments) { - delegate.warn(format, arguments); - } - - @Override - public void warn(String format, Object arg1, Object arg2) { - delegate.warn(format, arg1, arg2); - } - - @Override - public void warn(String msg, Throwable t) { - delegate.warn(msg, t); - } - - @Override - public boolean isWarnEnabled(Marker marker) { - return true; - } - - @Override - public void warn(Marker marker, String msg) { - delegate.warn(msg); - } - - @Override - public void warn(Marker marker, String format, Object arg) { - delegate.warn(format, arg); - } - - @Override - public void warn(Marker marker, String format, Object arg1, Object arg2) { - delegate.warn(format, arg1, arg2); - } - - @Override - public void warn(Marker marker, String format, Object... arguments) { - delegate.warn(format, arguments); - } - - @Override - public void warn(Marker marker, String msg, Throwable t) { - delegate.warn(msg, t); - } - - @Override - public boolean isErrorEnabled() { - return true; - } - - @Override - public void error(String msg) { - delegate.error(msg); - } - - @Override - public void error(String format, Object arg) { - delegate.error(format, arg); - } - - @Override - public void error(String format, Object arg1, Object arg2) { - delegate.error(format, arg1, arg2); - } - - @Override - public void error(String format, Object... arguments) { - delegate.error(format, arguments); - } - - @Override - public void error(String msg, Throwable t) { - delegate.error(msg, t); - } - - @Override - public boolean isErrorEnabled(Marker marker) { - return true; - } - - @Override - public void error(Marker marker, String msg) { - delegate.error(msg); - } - - @Override - public void error(Marker marker, String format, Object arg) { - delegate.error(format, arg); - } - - @Override - public void error(Marker marker, String format, Object arg1, Object arg2) { - delegate.error(format, arg1, arg2); - } - - @Override - public void error(Marker marker, String format, Object... arguments) { - delegate.error(format, arguments); - } - - @Override - public void error(Marker marker, String msg, Throwable t) { - delegate.error(msg, t); - } -} diff --git a/commons-logger/src/main/java/io/gitlab/jfronny/commons/logger/HotswapLoggerFactory.java b/commons-logger/src/main/java/io/gitlab/jfronny/commons/logger/HotswapLoggerFactory.java index 74c7f4d..e72dafd 100644 --- a/commons-logger/src/main/java/io/gitlab/jfronny/commons/logger/HotswapLoggerFactory.java +++ b/commons-logger/src/main/java/io/gitlab/jfronny/commons/logger/HotswapLoggerFactory.java @@ -1,13 +1,45 @@ package io.gitlab.jfronny.commons.logger; +import io.gitlab.jfronny.commons.ref.WeakSet; import org.jetbrains.annotations.Nullable; import org.slf4j.ILoggerFactory; import org.slf4j.Logger; import org.slf4j.event.Level; import java.util.Objects; +import java.util.Set; public class HotswapLoggerFactory implements LeveledLoggerFactory { + private static final Set KNOWN_INSTANCES = new WeakSet<>(); + + public static void resetAllStrategies() { + for (HotswapLoggerFactory factory : KNOWN_INSTANCES) { + factory.resetStrategy(); + } + } + + public static void updateAllStrategies(ILoggerFactory factory) { + for (HotswapLoggerFactory f : KNOWN_INSTANCES) { + f.updateStrategy(factory); + } + } + + public static void updateAllStrategies(LeveledLoggerFactory factory) { + for (HotswapLoggerFactory f : KNOWN_INSTANCES) { + f.updateStrategy(factory); + } + } + + public static void updateAllDefaultLevels(Level minimumLevel) { + for (HotswapLoggerFactory f : KNOWN_INSTANCES) { + f.updateDefaultLevel(minimumLevel); + } + } + + public HotswapLoggerFactory() { + KNOWN_INSTANCES.add(this); + } + private LeveledLoggerFactory defaultFactory = StdoutLogger::fancy; private Level minimumLevel = Level.INFO; private int version = 0;