"disable" (when possible) real logger's formatting when a (Ruby) formatter is set

Author: kares

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

@@ -81,6 +81,7 @@ public IRubyObject allocate(Ruby runtime, RubyClass klass) {
     private int level = NOT_SET;
 
     private RackLogger logger; // the "real" logger
+    //private Boolean loggerFormatting;
     private IRubyObject formatter = null; // optional
     private IRubyObject progname;
 
@@ -212,6 +213,18 @@ public IRubyObject get_formatter(final ThreadContext context) {
 
     @JRubyMethod(name = "formatter=")
     public IRubyObject set_formatter(final ThreadContext context, final IRubyObject formatter) {
+        if ( logger instanceof RackLogger.Base ) {
+            final RackLogger.Base logger = (RackLogger.Base) this.logger;
+            //if ( loggerFormatting == null ) loggerFormatting = logger.isFormatting();
+            if ( formatter.isNil() ) {
+                //if ( loggerFormatting != null && loggerFormatting.booleanValue() ) {
+                    logger.setFormatting(true);
+                //}
+            }
+            else { // if formatter set disable 'potential' logger formatting
+                logger.setFormatting(false);
+            }
+        }
         return this.formatter = formatter;
     }
 

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

@@ -19,16 +19,88 @@
     org.jruby.rack.servlet.DefaultServletRackContext.new(rack_config)
   end
 
+  let(:level) { org.jruby.rack.RackLogger::Level }
+
+  let(:logger) { JRuby::Rack::Logger.new real_logger }
+
   before { JRuby::Rack.context = rack_context }
   after { JRuby::Rack.context = nil }
 
   it 'works with a servlet context' do
-    logger = JRuby::Rack::Logger.new real_logger
     logger.debug?
     logger.debug 'hogy basza meg a zold tucsok!'
     expect( real_logger.logged_content ).to match /^DEBUG.*hogy .* a zold tucsok!$/
   end
 
+  it 'delegates to passed logger instance' do
+    logger.debug 'debugging'
+    expect( real_logger.logged_content ).to match /^DEBUG.*debugging$/
+    real_logger.reset
+    logger.info 'infooo'
+    expect( real_logger.logged_content ).to match /^INFO.*infooo$/
+    real_logger.reset
+    logger.warn 'warning'
+    expect( real_logger.logged_content ).to match /^WARN.*warning$/
+    real_logger.reset
+    logger.error 'errored'
+    expect( real_logger.logged_content ).to match /^ERROR.*errored$/
+    real_logger.reset
+    logger.fatal 'totaal!'
+    expect( real_logger.logged_content ).to match /^FATAL.*totaal!$/
+  end
+
+  it 'uses JRuby::Rack.context when no initialize argument' do
+    logger = JRuby::Rack::Logger.new
+    logger.debug?
+    logger.debug 'hogy basza meg a zold tucsok!'
+    expect( logger.real_logger ).to be rack_context
+  end
+
+  it 'delegates level check (when level is not set)' do
+    real_logger.level = level::INFO
+    expect( logger.debug? ).to be false
+    expect( logger.info? ).to be true
+    real_logger.level = level::WARN
+    expect( logger.info? ).to be false
+  end
+
+  it 'uses level check when level is explicitly set' do
+    real_logger.level = level::INFO
+    logger.level = 2 # Logger.::WARN
+    expect( logger.info? ).to be false
+    expect( logger.warn? ).to be true
+    logger.level = nil
+    expect( logger.info? ).to be true
+  end
+
+  it "combines level check with delegate's level" do
+    real_logger.level = level::WARN
+    logger.level = 1 # Logger.::INFO
+    expect( logger.debug? ).to be false
+    expect( logger.info? ).to be false
+    expect( logger.warn? ).to be true
+    logger.level = nil
+    expect( logger.info? ).to be false
+    expect( logger.debug? ).to be false
+    expect( logger.warn? ).to be true
+  end
+
+  it "disables real logger's formatting when formatter is set" do
+    real_logger.formatting = true
+    expect( real_logger.formatting? ).to be true
+
+    logger.formatter = Proc.new { |severity, timestamp, progname, msg| "#{severity[0, 1]} #{msg}" }
+    logger.warn 'hogy basza meg a zold tucsok!'
+    expect( real_logger.logged_content ).to eql "W hogy basza meg a zold tucsok!\n"
+
+    expect( real_logger.formatting? ).to be false
+  end
+
+#  it 'handles constant resolution (for Rails compatibility)' do
+#    expect( logger.class::DEBUG ).to eql 0
+#    expect( logger.class::FATAL ).to eql 4
+#  end
+
   describe JRuby::Rack::ServletLog do
 
     it "writes messages to the servlet context" do