[feat] pass down exception directly to logger

Author: kares

src/main/java/org/jruby/rack/ext/Logger.java

@@ -39,7 +39,6 @@
 import org.jruby.rack.RackContext;
 import org.jruby.rack.RackLogger;
 import org.jruby.rack.logging.ServletContextLogger;
-import org.jruby.rack.util.ExceptionUtils;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
@@ -382,10 +381,9 @@ private boolean add(final int severity, final ThreadContext context, IRubyObject
             final long datetime = System.currentTimeMillis();
             msg = format_message(context, severity, datetime, progname, msg);
         }
-        else if ( msg instanceof RubyException ) { // print backtrace for error
-            final RubyException error = (RubyException) msg;
-            error.prepareIntegratedBacktrace(context, null);
-            doLog( loggerLevel, ExceptionUtils.formatError(error) );
+        else if ( msg instanceof RubyException ) {
+            final RubyException ex = (RubyException) msg;
+            doLog( loggerLevel, ex.toThrowable() );
             return true;
         }
         // @logdev.write(format_message(format_severity(severity), Time.now, progname, message))
@@ -462,12 +460,16 @@ public <T> T toJava(Class<T> target) {
         return super.toJava(target);
     }
 
+    private void doLog(RackLogger.Level level, Throwable ex) {
+        logger.log(level, "", ex);
+    }
+
     private void doLog(RackLogger.Level level, CharSequence message) {
-        logger.log( level, message );
+        logger.log(level, message);
     }
 
     private void doLog(RubyString message) {
-        logger.log( message );
+        logger.log(message);
     }
 
     /**

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

@@ -113,12 +113,7 @@ public static void printLevel(final RackLogger.Base logger, final Level level, f
     }
 
     public static void printMessage(final PrintStream out, final CharSequence message) {
-        if ( message.charAt(message.length() - 1) == '\n' ) {
-            out.print(message);
-        }
-        else {
-            out.println(message);
-        }
+        out.println(message);
     }
 
 }

src/main/java/org/jruby/rack/util/ExceptionUtils.java

@@ -26,13 +26,8 @@
 import java.io.IOException;
 
 import org.jruby.Ruby;
-import org.jruby.RubyArray;
 import org.jruby.RubyClass;
-import org.jruby.RubyException;
-import org.jruby.RubyString;
 import org.jruby.exceptions.RaiseException;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
 
 /**
  *
@@ -54,53 +49,10 @@ public static RaiseException newIOError(final Ruby runtime, final IOException ca
         return raise;
     }
 
-    private static RaiseException newRaiseException(final Ruby runtime,
-        final RubyClass errorClass, final Throwable cause) {
+    private static RaiseException newRaiseException(final Ruby runtime, final RubyClass errorClass, final Throwable cause) {
         final String message = cause.getMessage();
         RaiseException raise = RaiseException.from(runtime, errorClass, message);
         raise.initCause(cause);
         return raise;
     }
-
-    public static CharSequence formatError(final RubyException error) {
-        final StringBuilder out = new StringBuilder(128);
-        appendError(error, out); return out;
-    }
-
-    private static void appendInspect(final RubyException error, final StringBuilder out) {
-        final RubyClass errorClass = error.getMetaClass().getRealClass();
-        if ( error.getMessage() != null && ! error.getMessage().isNil() ) {
-            out.append("#<").append( errorClass.getName() ).append(": ");
-            out.append( error.getMessage().asString() ).append('>');
-        }
-        else {
-            out.append( errorClass.getName() );
-        }
-    }
-
-    public static void appendError(final RubyException error, final StringBuilder out) {
-        appendInspect(error, out);
-        appendBacktrace(error, out.append('\n'));
-    }
-
-    public static void appendBacktrace(final RubyException error, final StringBuilder out) {
-        appendBacktrace(error, 0, out);
-    }
-
-    public static void appendBacktrace(final RubyException error, final int skip,
-        final StringBuilder out) {
-        final ThreadContext context = error.getRuntime().getCurrentContext();
-        final IRubyObject backtrace = error.callMethod(context, "backtrace");
-        if ( ! backtrace.isNil() ) {
-            final RubyArray<?> trace = backtrace.convertToArray();
-            out.ensureCapacity(out.length() + 24 * trace.getLength());
-            for ( int i = skip; i < trace.getLength(); i++ ) {
-                IRubyObject stackTraceLine = trace.eltInternal(i);
-                if ( stackTraceLine instanceof RubyString ) {
-                    out.append("\tfrom ").append(stackTraceLine).append('\n');
-                }
-            }
-        }
-    }
-
 }

src/spec/ruby/jruby/rack/logger_spec.rb

@@ -97,6 +97,15 @@
     expect( real_logger.formatting? ).to be false
   end
 
+  it 'logs exception with trace when passed as argument' do
+    begin
+      raise IndexError.new('TEST')
+    rescue => e
+      logger.debug(e)
+    end
+    expect( real_logger.logged_content ).to match /^DEBUG.*?IndexError.*?TEST.*?at.*?logger_spec.rb.*/m
+  end
+
   it 'handles constant resolution (for Rails compatibility)' do
     expect( logger.class::DEBUG ).to eql 0
     expect( logger.class::FATAL ).to eql 4