slf4j bridge - more direct logging (#719)

* slf4j bridge - more direct logging * slf4j bridge - more direct logging * slf4j bridge - more direct logging * slf4j bridge - more direct logging * slf4j bridge - more direct logging * slf4j bridge - more direct logging * fmt
zio · May 18, 2023 · ff18044 · ff18044
1 parent 27df706
commit ff18044
Show file tree

Hide file tree

Showing 11 changed files with 376 additions and 324 deletions.
diff --git a/slf4j-bridge/src/main/java/org/slf4j/helpers/ZioLoggerBase.java b/slf4j-bridge/src/main/java/org/slf4j/helpers/ZioLoggerBase.java
@@ -15,9 +15,179 @@
  */
 package org.slf4j.helpers;
 
+import org.slf4j.Marker;
+import org.slf4j.event.Level;
+
 public abstract class ZioLoggerBase extends MarkerIgnoringBase {
 
     public ZioLoggerBase(String name) {
         this.name = name;
     }
+
+    abstract protected void log(Level level, Marker marker, String messagePattern, Object[] arguments, Throwable throwable);
+
+    private void logWithThrowable(Level level, Marker marker, String msg, Throwable t) {
+        log(level, marker, msg, null, t);
+    }
+
+    private void logWithArg(Level level, Marker marker, String msg, Object arg1) {
+        log(level, marker, msg, new Object[]{arg1}, null);
+    }
+
+    private void logWithArgs(Level level, Marker marker, String msg, Object arg1, Object arg2) {
+        if (arg2 instanceof Throwable) {
+            log(level, marker, msg, new Object[]{arg1}, (Throwable) arg2);
+        } else {
+            log(level, marker, msg, new Object[]{arg1, arg2}, null);
+        }
+    }
+
+    private void logWithArgs(Level level, Marker marker, String msg, Object[] args) {
+        Throwable throwableCandidate = MessageFormatter.getThrowableCandidate(args);
+        if (throwableCandidate != null) {
+            Object[] trimmedCopy = MessageFormatter.trimmedCopy(args);
+            log(level, marker, msg, trimmedCopy, throwableCandidate);
+        } else {
+            log(level, marker, msg, args, null);
+        }
+    }
+
+    @Override
+    public boolean isTraceEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isErrorEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isWarnEnabled() {
+        return true;
+    }
+
+    @Override
+    public boolean isInfoEnabled() {
+        return true;
+    }
+
+    @Override
+    public void trace(String msg) {
+        logWithThrowable(Level.TRACE, null, msg, null);
+    }
+
+    @Override
+    public void trace(String format, Object arg) {
+        logWithArg(Level.TRACE, null, format, arg);
+    }
+
+
+    @Override
+    public void trace(String format, Object arg1, Object arg2) {
+        logWithArgs(Level.TRACE, null, format, arg1, arg2);
+    }
+
+
+    @Override
+    public void trace(String format, Object... arguments) {
+        logWithArgs(Level.TRACE, null, format, arguments);
+    }
+
+
+    @Override
+    public void trace(String msg, Throwable t) {
+        logWithThrowable(Level.TRACE, null, msg, t);
+    }
+
+
+    public void debug(String msg) {
+        logWithThrowable(Level.DEBUG, null, msg, null);
+    }
+
+
+    public void debug(String format, Object arg) {
+        logWithArg(Level.DEBUG, null, format, arg);
+    }
+
+
+    public void debug(String format, Object arg1, Object arg2) {
+        logWithArgs(Level.DEBUG, null, format, arg1, arg2);
+    }
+
+
+    public void debug(String format, Object... arguments) {
+        logWithArgs(Level.DEBUG, null, format, arguments);
+    }
+
+
+    public void debug(String msg, Throwable t) {
+        logWithThrowable(Level.DEBUG, null, msg, t);
+    }
+
+
+    public void info(String msg) {
+        logWithThrowable(Level.INFO, null, msg, null);
+    }
+
+    public void info(String format, Object arg) {
+        logWithArg(Level.INFO, null, format, arg);
+    }
+
+    public void info(String format, Object arg1, Object arg2) {
+        logWithArgs(Level.INFO, null, format, arg1, arg2);
+    }
+
+    public void info(String format, Object... arguments) {
+        logWithArgs(Level.INFO, null, format, arguments);
+    }
+
+    public void info(String msg, Throwable t) {
+        logWithThrowable(Level.INFO, null, msg, t);
+    }
+
+    public void warn(String msg) {
+        logWithThrowable(Level.WARN, null, msg, null);
+    }
+
+    public void warn(String format, Object arg) {
+        logWithArg(Level.WARN, null, format, arg);
+    }
+
+    public void warn(String format, Object arg1, Object arg2) {
+        logWithArgs(Level.WARN, null, format, arg1, arg2);
+    }
+
+    public void warn(String format, Object... arguments) {
+        logWithArgs(Level.WARN, null, format, arguments);
+    }
+
+    public void warn(String msg, Throwable t) {
+        logWithThrowable(Level.WARN, null, msg, t);
+    }
+
+    public void error(String msg) {
+        logWithThrowable(Level.ERROR, null, msg, null);
+    }
+
+    public void error(String format, Object arg) {
+        logWithArg(Level.ERROR, null, format, arg);
+    }
+
+    public void error(String format, Object arg1, Object arg2) {
+        logWithArgs(Level.ERROR, null, format, arg1, arg2);
+    }
+
+    public void error(String format, Object... arguments) {
+        logWithArgs(Level.ERROR, null, format, arguments);
+    }
+
+    public void error(String msg, Throwable t) {
+        logWithThrowable(Level.ERROR, null, msg, t);
+    }
 }
diff --git a/slf4j-bridge/src/main/scala-2/org/slf4j/impl/ZioLogger.scala b/slf4j-bridge/src/main/scala-2/org/slf4j/impl/ZioLogger.scala