Merge remote-tracking branch 'upstream/master' into jakarta-update

# Conflicts:
#	.github/workflows/maven.yml
#	pom.xml
#	src/main/java/org/jruby/rack/ext/Logger.java
#	src/spec/ruby/jruby/rack/integration_spec.rb

Author: chadlwilson

.github/workflows/maven.yml

@@ -18,10 +18,10 @@ jobs:
 
     strategy:
       matrix:
-        jruby_version: [ '9.4.13.0', '10.0.1.0' ]
+        jruby_version: [ '9.4.13.0', '10.0.2.0' ]
         java_version: [ '17', '21' ]
         exclude:
-          - jruby_version: '10.0.1.0'
+          - jruby_version: '10.0.2.0'
             java_version: '17' # JRuby 10 requires Java 21
       fail-fast: false
 
@@ -50,13 +50,13 @@ jobs:
 
     strategy:
       matrix:
-        jruby_version: [ '9.4.13.0', '10.0.1.0' ]
+        jruby_version: [ '9.4.13.0', '10.0.2.0' ]
         java_version: [ '17', '21' ]
         appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72', 'rails80' ]
         exclude:
           - jruby_version: '9.4.13.0'
             appraisal: 'rails80' # Requires Ruby 3.4 compatibility, which JRuby 9.4 does not support
-          - jruby_version: '10.0.1.0'
+          - jruby_version: '10.0.2.0'
             java_version: '17' # JRuby 10 requires Java 21
       fail-fast: false
 
@@ -75,7 +75,7 @@ jobs:
           cache: maven
 
       - name: Setup JRuby
-        uses: ruby/setup-ruby@2a7b30092b0caf9c046252510f9273b4875f3db9 # v1.254.0
+        uses: ruby/setup-ruby@829114fc20da43a41d27359103ec7a63020954d4 # v1.255.0
         with:
           ruby-version: jruby-${{ matrix.jruby_version }}
           bundler-cache: 'false' # Need to install later so we can vary from Gemfile.lock as required for JRuby version compatibility

README.md

@@ -297,12 +297,12 @@ logging system, configure `jruby.rack.logging` as follows:
 - `servlet_context` (default): Sends log messages to the servlet context.
 - `stdout`: Sends log messages to the standard output stream `System.out`.
 - `slf4j`: Sends log messages to SLF4J. SLF4J configuration is left up to you,
-  please refer to http://www.slf4j.org/docs.html .
-- `log4j`: Sends log messages to log4J. Again, Log4J configuration is
-  left up to you, consult http://logging.apache.org/log4j/ .
+  please refer to https://www.slf4j.org/manual.html .
+- `log4j`: Sends log messages through Log4j. Only Log4j 2.x is supported, for 
+- configuration please consult https://logging.apache.org/log4j/2.x/index.html .
 - `commons_logging`: Routes logs to commons-logging. You still need to configure
-  an underlying logging implementation with JCL. We recommend using the logger
-  library wrapper directly if possible, see http://commons.apache.org/logging/ .
+  an underlying logging implementation with JCL. 
+  We recommend rather using the logger library wrapper directly when possible.
 - `jul`: Directs log messages via Java's core logging facilities (util.logging).
 
 For those loggers that require a specific named logger, set it with the

Rakefile

@@ -108,7 +108,7 @@ task :speconly => [ :resources, :test_resources ] do
   if ENV['SKIP_SPECS'].to_s == 'true'
     puts "Skipping specs due to SKIP_SPECS=#{ENV['SKIP_SPECS']}"
   else
-    opts = ENV['SPEC_OPTS'] ? ENV['SPEC_OPTS'] : %q{ --format documentation --color }
+    opts = ENV['SPEC_OPTS'] ? ENV['SPEC_OPTS'] : %q{ --format documentation --force-color }
     spec = ENV['SPEC'] || File.join(Dir.getwd, "src/spec/ruby/**/*_spec.rb")
     opts = opts.split(' ').push *FileList[spec].to_a
     ruby = ENV['RUBY'] || 'jruby'
@@ -165,7 +165,7 @@ end
 
 desc "Build the jruby-rack-#{GEM_VERSION}.gem"
 task :gem => [target_jar, target_jruby_rack, target_jruby_rack_version] do
-  Rake::Task['spec'].invoke unless ENV['SKIP_SPEC'] == 'true'
+  Rake::Task['spec'].invoke unless ENV['SKIP_SPECS'] == 'true'
   cp FileList["History.md", "LICENSE.txt", "README.md"], "target/gem"
   cp target_jar, "target/gem/lib"
   if (jars = FileList["target/gem/lib/*.jar"].to_a).size > 1

pom.xml

@@ -23,6 +23,7 @@
     <jruby.maven.plugins.version>3.0.6</jruby.maven.plugins.version>
     <gem.home>${project.build.directory}/rubygems</gem.home>
     <slf4j.version>2.0.17</slf4j.version>
+    <log4j.version>2.22.1</log4j.version>
     <spring.version>6.2.9</spring.version>
   </properties>
 
@@ -117,6 +118,18 @@
       <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>${log4j.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>${log4j.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>

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

@@ -166,12 +166,6 @@ protected RackLogger createLogger(final String loggerClass) {
                 throw new RackException("could not create logger: '" + loggerClass + "'", e.getTargetException());
             }
         }
-        //catch (ClassNotFoundException e) {
-        //    if ( ! isQuiet() ) {
-        //        err.println("failed creating logger: '" + loggerClass + "'");
-        //        e.printStackTrace(err);
-        //    }
-        //}
         catch (Exception e) {
             if ( ! isQuiet() ) {
                 err.println("failed creating logger: '" + loggerClass + "'");
@@ -411,6 +405,7 @@ private static Map<String,String> getLoggerTypes() {
         final Map<String,String> loggerTypes = new HashMap<>(8);
         loggerTypes.put("commons_logging", "org.jruby.rack.logging.CommonsLoggingLogger");
         loggerTypes.put("clogging", "org.jruby.rack.logging.CommonsLoggingLogger");
+        loggerTypes.put("log4j", "org.jruby.rack.logging.Log4jLogger");
         loggerTypes.put("slf4j", "org.jruby.rack.logging.Slf4jLogger");
         loggerTypes.put("jul", "org.jruby.rack.logging.JulLogger");
         return loggerTypes;

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

@@ -13,6 +13,6 @@
  * @author nicksieger
  */
 public interface RackContext extends RackLogger {
-    RackConfig getConfig(); /// NOTE: deprecate ?
+    RackConfig getConfig();
     String getServerInfo();
 }

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

@@ -47,4 +47,8 @@ public void setLevel(Level level) { /* noop */ }
         public boolean isFormatting() { return false; }
         public void setFormatting(boolean flag) { /* noop */ }
     }
+
+    interface DelegatingLogger extends RackLogger {
+        RackLogger unwrapLogger();
+    }
 }

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

@@ -39,6 +39,7 @@ public RackServletContextListener() {
         this.factory = factory;
     }
 
+    @Override
     public void contextInitialized(final ServletContextEvent event) {
         final ServletContext context = event.getServletContext();
         final ServletRackConfig config = new ServletRackConfig(context);
@@ -54,6 +55,7 @@ public void contextInitialized(final ServletContextEvent event) {
         }
     }
 
+    @Override
     public void contextDestroyed(final ServletContextEvent event) {
         final ServletContext context = event.getServletContext();
         final RackApplicationFactory factory =

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;
@@ -59,6 +58,8 @@ public class Logger extends RubyObject { // implements RackLogger
 
     // Logger::Severity :
 
+    private static final int LEVEL_NOT_SET = -1;
+
     // Low-level information, mostly for developers.
     static final int DEBUG = 0;
     // Generic (useful) information about system operation.
@@ -72,9 +73,7 @@ public class Logger extends RubyObject { // implements RackLogger
     // An unknown message that should always be logged.
     static final int UNKNOWN = 5;
 
-    private static final int NOT_SET = -1;
-
-    private int level = NOT_SET;
+    private int level = LEVEL_NOT_SET;
 
     private RackLogger logger; // the "real" logger
     private IRubyObject formatter = null; // optional
@@ -123,6 +122,10 @@ public IRubyObject initialize_copy(final ThreadContext context, final IRubyObjec
 
     @JRubyMethod
     public IRubyObject real_logger(final ThreadContext context) {
+        RackLogger logger = this.logger;
+        if (logger instanceof RackLogger.DelegatingLogger) {
+            logger = ((RackLogger.DelegatingLogger) logger).unwrapLogger();
+        }
         return JavaEmbedUtils.javaToRuby(context.runtime, logger);
     }
 
@@ -132,14 +135,16 @@ public RackLogger getRealLogger() {
 
     @JRubyMethod(name = "level", alias = "sev_threshold")
     public IRubyObject get_level(final ThreadContext context) {
-        if ( this.level == NOT_SET ) return context.nil;
-        return context.runtime.newFixnum(this.level);
+        return this.level == LEVEL_NOT_SET ? context.nil : context.runtime.newFixnum(this.level);
     }
 
     @JRubyMethod(name = "level=", alias = "sev_threshold=")
     public IRubyObject set_level(final ThreadContext context, final IRubyObject level) {
-        if ( level.isNil() ) { this.level = NOT_SET; return level; }
-        this.level = (int) level.convertToInteger("to_i").getLongValue();
+        if ( level.isNil() ) {
+            this.level = LEVEL_NOT_SET;
+            return level;
+        }
+        this.level = toInt(level);
         return get_level(context);
     }
 
@@ -182,10 +187,9 @@ private boolean isEnabledFor(final int severity) {
         return isEnabledFor(severity, mapLevel(severity));
     }
 
-    private boolean isEnabledFor(final int severity,
-        final RackLogger.Level loggerLevel) {
+    private boolean isEnabledFor(final int severity, final RackLogger.Level loggerLevel) {
         if ( loggerLevel == null ) return level <= severity;
-        if ( level == NOT_SET ) return logger.isEnabled(loggerLevel);
+        if ( level == LEVEL_NOT_SET) return logger.isEnabled(loggerLevel);
         return level <= severity && logger.isEnabled(loggerLevel);
     }
 
@@ -337,9 +341,7 @@ public IRubyObject unknown(final ThreadContext context, final Block block) {
     public IRubyObject add(final ThreadContext context, final IRubyObject[] args, final Block block) {
         int severity = UNKNOWN;
         final IRubyObject sev = args[0];
-        if ( ! sev.isNil() ) {
-            severity = (int) sev.convertToInteger("to_i").getLongValue();
-        }
+        if ( !sev.isNil() ) severity = toInt(sev);
         IRubyObject msg;
         if ( args.length > 1 ) {
             msg = args[1];
@@ -358,8 +360,7 @@ public IRubyObject add(final ThreadContext context, final IRubyObject severity,
         return context.runtime.newBoolean( add(UNKNOWN, context, msg, block) );
     }
 
-    private boolean add(final int severity, final ThreadContext context,
-        IRubyObject msg, final Block block) {
+    private boolean add(final int severity, final ThreadContext context, IRubyObject msg, final Block block) {
         // severity ||= UNKNOWN
         final RackLogger.Level loggerLevel = mapLevel(severity);
 
@@ -380,9 +381,8 @@ private boolean add(final int severity, final ThreadContext context,
             final long datetime = System.currentTimeMillis();
             msg = format_message(context, severity, datetime, progname, msg);
         }
-        else if (msg instanceof RubyException error) { // print backtrace for error
-            error.prepareIntegratedBacktrace(context, null);
-            doLog( loggerLevel, ExceptionUtils.formatError(error) );
+        else if ( msg instanceof RubyException ex ) {
+            doLog( loggerLevel, ex.toThrowable() );
             return true;
         }
         // @logdev.write(format_message(format_severity(severity), Time.now, progname, message))
@@ -414,16 +414,14 @@ public IRubyObject format_message(final ThreadContext context, final IRubyObject
     private IRubyObject format_message(final ThreadContext context,
                                        final int severityVal, final long datetimeMillis,
                                        final IRubyObject progname, final IRubyObject msg) {
-        final IRubyObject severity =
-            RubyString.newStringShared(context.runtime, formatSeverity(severityVal));
+        final IRubyObject severity = RubyString.newStringShared(context.runtime, formatSeverity(severityVal));
         final RubyTime datetime = RubyTime.newTime(context.runtime, datetimeMillis);
         return format_message(context, new IRubyObject[] { severity, datetime, progname, msg });
     }
 
     @JRubyMethod(visibility = Visibility.PRIVATE)
     public IRubyObject format_severity(final ThreadContext context, final IRubyObject sev) {
-        final int severity = (int) sev.convertToInteger("to_i").getLongValue();
-        return RubyString.newStringShared(context.runtime, formatSeverity(severity));
+        return RubyString.newStringShared(context.runtime, formatSeverity(toInt(sev)));
     }
 
     private static final ByteList FORMATTED_DEBUG =
@@ -450,27 +448,27 @@ private static ByteList formatSeverity(final int severity) {
         };
     }
 
+    private static int toInt(final IRubyObject level) {
+        return level.convertToInteger("to_i").getIntValue();
+    }
+
     @SuppressWarnings("unchecked")
     @Override
     public <T> T toJava(Class<T> target) {
-        // NOTE: maybe this is not a good idea ?!
-        if ( RackLogger.class == target ) return (T) logger;
+        if ( RackLogger.class.isAssignableFrom(target) && target.isInstance(logger) ) return (T) logger;
         return super.toJava(target);
     }
 
-    private void doLog(RackLogger.Level level, CharSequence message) {
-        logger.log( level, message );
+    private void doLog(RackLogger.Level level, Throwable ex) {
+        logger.log(level, "", ex);
     }
 
-    private void doLog(RubyString message) {
-        logger.log( message );
+    private void doLog(RackLogger.Level level, CharSequence message) {
+        logger.log(level, message);
     }
 
-    // (old) BufferedLogger API compatibility :
-
-    @JRubyMethod(name = "flush", alias = { "auto_flushing", "auto_flushing=" })
-    public IRubyObject stub(final ThreadContext context) {
-        return context.nil;
+    private void doLog(RubyString message) {
+        logger.log(message);
     }
 
     /**