rack logger base - support for (optional) level property + formatting flag

Author: kares

src/main/java/org/jruby/rack/RackLogger.java

@@ -47,6 +47,14 @@ enum Level {
 
     abstract class Base implements RackLogger {
 
+        public abstract Level getLevel() ;
+
+        public void setLevel(Level level) { /* noop */ }
+
+        public boolean isFormatting() { return false; }
+
+        public void setFormatting(boolean flag) { /* noop */ }
+
         @Override
         public void log(String message) {
             log(Level.INFO, message);

src/main/java/org/jruby/rack/embed/Context.java

@@ -105,6 +105,8 @@ public boolean isEnabled(Level level) {
         return this.level.ordinal() <= level.ordinal();
     }
 
+
+
     private class DefaultLogger extends RackLogger.Base {
 
         @Override
@@ -127,6 +129,9 @@ public void log(Level level, String message, Throwable ex) {
         @Override
         public boolean isEnabled(Level level) { return true; }
 
+        @Override
+        public Level getLevel() { return null; /* unknown */ }
+
     }
 
 }

src/main/java/org/jruby/rack/logging/CommonsLoggingLogger.java

@@ -69,4 +69,14 @@ public void log(Level level, String message, Throwable ex) {
         }
     }
 
+    @Override
+    public Level getLevel() {
+        if ( logger.isDebugEnabled() ) return Level.DEBUG;
+        if ( logger.isInfoEnabled() )  return Level.INFO ;
+        if ( logger.isWarnEnabled() )  return Level.WARN ;
+        if ( logger.isErrorEnabled() ) return Level.ERROR;
+        if ( logger.isFatalEnabled() ) return Level.FATAL;
+        return null;
+    }
+
 }

src/main/java/org/jruby/rack/logging/JulLogger.java

@@ -86,4 +86,14 @@ private static java.util.logging.Level mapLevel(
         return defaultLevel;
     }
 
+    @Override
+    public Level getLevel() {
+        if ( logger.isLoggable(java.util.logging.Level.FINE) ) return Level.DEBUG;
+        if ( logger.isLoggable(java.util.logging.Level.INFO) ) return Level.INFO ;
+        if ( logger.isLoggable(java.util.logging.Level.WARNING) ) return Level.WARN ;
+        if ( logger.isLoggable(java.util.logging.Level.SEVERE) ) return Level.ERROR;
+        if ( logger.isLoggable(java.util.logging.Level.SEVERE) ) return Level.FATAL;
+        return null;
+    }
+
 }

src/main/java/org/jruby/rack/logging/Log4jLogger.java

@@ -74,4 +74,14 @@ public void log(Level level, String message, Throwable ex) {
         }
     }
 
+    @Override
+    public Level getLevel() {
+        if ( logger.isEnabledFor(org.apache.log4j.Level.DEBUG) ) return Level.DEBUG;
+        if ( logger.isEnabledFor(org.apache.log4j.Level.INFO) )  return Level.INFO ;
+        if ( logger.isEnabledFor(org.apache.log4j.Level.WARN) )  return Level.WARN ;
+        if ( logger.isEnabledFor(org.apache.log4j.Level.ERROR) ) return Level.ERROR;
+        if ( logger.isEnabledFor(org.apache.log4j.Level.FATAL) ) return Level.FATAL;
+        return null;
+    }
+
 }

src/main/java/org/jruby/rack/logging/OutputStreamLogger.java

@@ -36,22 +36,25 @@ public class OutputStreamLogger extends RackLogger.Base {
 
     private final PrintStream out;
     private Level level;
+    private boolean formatting = true;
 
-    public OutputStreamLogger(OutputStream out) {
+    public OutputStreamLogger(final OutputStream out) {
         this(new PrintStream(out));
     }
 
-    public OutputStreamLogger(PrintStream out) {
+    public OutputStreamLogger(final PrintStream out) {
         if ( out == null ) {
             throw new IllegalArgumentException("no stream");
         }
         this.out = out;
     }
 
+    @Override
     public Level getLevel() {
         return level;
     }
 
+    @Override
     public void setLevel(Level level) {
         this.level = level;
     }
@@ -69,7 +72,7 @@ public void log(String message, Throwable ex) {
     @Override
     public void log(Level level, String message) {
         if ( ! isEnabled(level) ) return;
-        out.print(level); out.print(": ");
+        printLevel(this, level, out);
         doLog(message);
     }
 
@@ -81,7 +84,7 @@ private void doLog(final CharSequence message) {
     @Override
     public void log(Level level, String message, Throwable ex) {
         if ( ! isEnabled(level) ) return;
-        out.print(level); out.print(": ");
+        printLevel(this, level, out);
         doLog(message, ex);
     }
 
@@ -97,6 +100,18 @@ public boolean isEnabled(final Level level) {
         return this.level.ordinal() <= level.ordinal();
     }
 
+    @Override
+    public boolean isFormatting() { return this.formatting; }
+
+    @Override
+    public void setFormatting(boolean formatting) { this.formatting = formatting; }
+
+    public static void printLevel(final RackLogger.Base logger, final Level level, final PrintStream out) {
+        if ( logger.isFormatting() ) {
+            out.print(level); out.print(": ");
+        }
+    }
+
     public static void printMessage(final PrintStream out, final CharSequence message) {
         if ( message.charAt(message.length() - 1) == '\n' ) {
             out.print(message);

src/main/java/org/jruby/rack/logging/ServletContextLogger.java

@@ -20,14 +20,6 @@ public ServletContextLogger(ServletContext context) {
         this.context = context;
     }
 
-    //public Level getLevel() {
-    //    return level;
-    //}
-
-    //public void setLevel(Level level) {
-    //    this.level = level;
-    //}
-
     @Override
     public void log(String message) {
         context.log(message);
@@ -55,4 +47,9 @@ public boolean isEnabled(Level level) {
         //return this.level.ordinal() <= level.ordinal();
     }
 
+    @Override
+    public Level getLevel() {
+        return null; // unknown
+    }
+
 }

src/main/java/org/jruby/rack/logging/Slf4jLogger.java

@@ -73,4 +73,14 @@ public void log(Level level, String message, Throwable ex) {
         }
     }
 
+    @Override
+    public Level getLevel() {
+        if ( logger.isDebugEnabled() ) return Level.DEBUG;
+        if ( logger.isInfoEnabled() )  return Level.INFO ;
+        if ( logger.isWarnEnabled() )  return Level.WARN ;
+        if ( logger.isErrorEnabled() ) return Level.ERROR;
+        if ( logger.isErrorEnabled() ) return Level.FATAL;
+        return null;
+    }
+
 }

src/spec/java/org/jruby/rack/logging/RaiseLogger.java

@@ -110,4 +110,7 @@ public void log(Level level, String message, Throwable ex) {
         }
     }
 
+    @Override
+    public Level getLevel() { return null; }
+
 }