[log] Rename minimum level

This commit is contained in:
Johannes Frohnmeyer 2022-09-15 14:46:06 +02:00
parent 720a3a353c
commit c62b74f293
Signed by: Johannes
GPG Key ID: E76429612C2929F4
3 changed files with 40 additions and 36 deletions

View File

@ -14,7 +14,7 @@ public class DelegateLogger implements Logger {
}
protected Logger delegate;
protected Level level = Level.TRACE;
protected Level minimumLevel = Level.TRACE;
@Override
public @Nullable String getName() {
@ -23,121 +23,121 @@ public class DelegateLogger implements Logger {
@Override
public void trace(String msg) {
if (level.shouldOmit(Level.TRACE)) return;
if (minimumLevel.shouldOmit(Level.TRACE)) return;
delegate.trace(msg);
}
@Override
public void trace(String format, Object arg) {
if (level.shouldOmit(Level.TRACE)) return;
if (minimumLevel.shouldOmit(Level.TRACE)) return;
delegate.trace(format, arg);
}
@Override
public void trace(String format, Object... args) {
if (level.shouldOmit(Level.TRACE)) return;
if (minimumLevel.shouldOmit(Level.TRACE)) return;
delegate.trace(format, args);
}
@Override
public void trace(String msg, Throwable t) {
if (level.shouldOmit(Level.TRACE)) return;
if (minimumLevel.shouldOmit(Level.TRACE)) return;
delegate.trace(msg, t);
}
@Override
public void debug(String msg) {
if (level.shouldOmit(Level.DEBUG)) return;
if (minimumLevel.shouldOmit(Level.DEBUG)) return;
delegate.debug(msg);
}
@Override
public void debug(String format, Object arg) {
if (level.shouldOmit(Level.DEBUG)) return;
if (minimumLevel.shouldOmit(Level.DEBUG)) return;
delegate.debug(format, arg);
}
@Override
public void debug(String format, Object... args) {
if (level.shouldOmit(Level.DEBUG)) return;
if (minimumLevel.shouldOmit(Level.DEBUG)) return;
delegate.debug(format, args);
}
@Override
public void debug(String msg, Throwable t) {
if (level.shouldOmit(Level.DEBUG)) return;
if (minimumLevel.shouldOmit(Level.DEBUG)) return;
delegate.debug(msg, t);
}
@Override
public void info(String msg) {
if (level.shouldOmit(Level.INFO)) return;
if (minimumLevel.shouldOmit(Level.INFO)) return;
delegate.info(msg);
}
@Override
public void info(String format, Object arg) {
if (level.shouldOmit(Level.INFO)) return;
if (minimumLevel.shouldOmit(Level.INFO)) return;
delegate.info(format, arg);
}
@Override
public void info(String format, Object... args) {
if (level.shouldOmit(Level.INFO)) return;
if (minimumLevel.shouldOmit(Level.INFO)) return;
delegate.info(format, args);
}
@Override
public void info(String msg, Throwable t) {
if (level.shouldOmit(Level.INFO)) return;
if (minimumLevel.shouldOmit(Level.INFO)) return;
delegate.info(msg, t);
}
@Override
public void warn(String msg) {
if (level.shouldOmit(Level.WARN)) return;
if (minimumLevel.shouldOmit(Level.WARN)) return;
delegate.warn(msg);
}
@Override
public void warn(String format, Object arg) {
if (level.shouldOmit(Level.WARN)) return;
if (minimumLevel.shouldOmit(Level.WARN)) return;
delegate.warn(format, arg);
}
@Override
public void warn(String format, Object... args) {
if (level.shouldOmit(Level.WARN)) return;
if (minimumLevel.shouldOmit(Level.WARN)) return;
delegate.warn(format, args);
}
@Override
public void warn(String msg, Throwable t) {
if (level.shouldOmit(Level.WARN)) return;
if (minimumLevel.shouldOmit(Level.WARN)) return;
delegate.warn(msg, t);
}
@Override
public void error(String msg) {
if (level.shouldOmit(Level.ERROR)) return;
if (minimumLevel.shouldOmit(Level.ERROR)) return;
delegate.error(msg);
}
@Override
public void error(String format, Object arg) {
if (level.shouldOmit(Level.ERROR)) return;
if (minimumLevel.shouldOmit(Level.ERROR)) return;
delegate.error(format, arg);
}
@Override
public void error(String format, Object... args) {
if (level.shouldOmit(Level.ERROR)) return;
if (minimumLevel.shouldOmit(Level.ERROR)) return;
delegate.error(format, args);
}
@Override
public void error(String msg, Throwable t) {
if (level.shouldOmit(Level.ERROR)) return;
if (minimumLevel.shouldOmit(Level.ERROR)) return;
delegate.error(msg, t);
}
@ -162,17 +162,17 @@ public class DelegateLogger implements Logger {
/**
* Set the minimum level messages must have to not be discarded
* @param minLevel The new minimum
* @param minimumLevel The new minimum
*/
public void setLevel(Level minLevel) {
this.level = Objects.requireNonNull(minLevel);
public void setMinimumLevel(Level minimumLevel) {
this.minimumLevel = Objects.requireNonNull(minimumLevel);
}
/**
* Get the minimum level messages must have to not be discarded
* @return the minimum
*/
public Level getLevel() {
return level;
public Level getMinimumLevel() {
return minimumLevel;
}
}

View File

@ -10,7 +10,7 @@ public class HotSwappingDelegateLogger extends DelegateLogger {
public static Function<String, Logger> LOGGER_BUILDER;
private static Level MINIMUM_LEVEL = Level.INFO;
private static final Set<HotSwappingDelegateLogger> KNOWN_LOGGERS = new WeakSet<>();
protected boolean levelChanged = false;
protected boolean minimumLevelChanged = false;
static {
resetStrategy();
@ -29,11 +29,11 @@ public class HotSwappingDelegateLogger extends DelegateLogger {
}
}
public static void updateLevel(Level minimumLevel) {
public static void updateMinimumLevel(Level minimumLevel) {
MINIMUM_LEVEL = Objects.requireNonNull(minimumLevel);
synchronized (KNOWN_LOGGERS) {
for (HotSwappingDelegateLogger ref : KNOWN_LOGGERS) {
ref.updateLevel();
ref.updateMinimumLevel();
}
}
}
@ -48,7 +48,7 @@ public class HotSwappingDelegateLogger extends DelegateLogger {
this.name = name;
synchronized (KNOWN_LOGGERS) {
updateStrategy();
updateLevel();
updateMinimumLevel();
KNOWN_LOGGERS.add(this);
}
}
@ -57,15 +57,15 @@ public class HotSwappingDelegateLogger extends DelegateLogger {
delegate = LOGGER_BUILDER.apply(name);
}
private void updateLevel() {
if (!levelChanged) {
level = MINIMUM_LEVEL;
private void updateMinimumLevel() {
if (!minimumLevelChanged) {
minimumLevel = MINIMUM_LEVEL;
}
}
@Override
public void setLevel(Level minLevel) {
super.setLevel(minLevel);
this.levelChanged = true;
public void setMinimumLevel(Level minLevel) {
super.setMinimumLevel(minLevel);
this.minimumLevelChanged = true;
}
}

View File

@ -21,6 +21,10 @@ public interface Logger {
HotSwappingDelegateLogger.resetStrategy();
}
static void setMinimumLevel(@NotNull Level level) {
HotSwappingDelegateLogger.updateMinimumLevel(level);
}
@Nullable String getName();
default void trace(String msg) {