change rails context listener to assume thread-safe by default

Author: kares

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

@@ -69,11 +69,8 @@ public void contextDestroyed(final ServletContextEvent event) {
     protected RackApplicationFactory newApplicationFactory(RackConfig config) {
         if (factory != null) return factory; // only != null while testing
 
-        final RackApplicationFactory factory = new DefaultRackApplicationFactory();
-        final Integer maxRuntimes = config.getMaximumRuntimes();
-        // for backwards compatibility when runtime min/max values not specified
-        // we assume a single shared (threadsafe) runtime to be used :
-        if ( maxRuntimes == null || maxRuntimes.intValue() == 1 ) {
+        final RackApplicationFactory factory = getRealRackApplicationFactoryImpl();
+        if (useSharedApplication((config))) {
             return new SharedRackApplicationFactory(factory);
         } 
         else {
@@ -82,7 +79,16 @@ protected RackApplicationFactory newApplicationFactory(RackConfig config) {
                     new PoolingRackApplicationFactory(factory) ;
         }
     }
-    
+
+    private static boolean useSharedApplication(final RackConfig config) {
+        final Integer maxRuntimes = config.getMaximumRuntimes();
+        return maxRuntimes == null || maxRuntimes == 1;
+    }
+
+    protected RackApplicationFactory getRealRackApplicationFactoryImpl() {
+        return new DefaultRackApplicationFactory();
+    }
+
     protected void handleInitializationException(
             final Exception e,
             final RackApplicationFactory factory,
@@ -96,5 +102,5 @@ protected void handleInitializationException(
         // NOTE: factory should have already logged the error ...
         rackContext.log(ERROR, "initialization failed", e);
     }
-    
+
 }

src/main/java/org/jruby/rack/rails/RailsServletContextListener.java

@@ -7,32 +7,17 @@
 
 package org.jruby.rack.rails;
 
-import org.jruby.rack.SerialPoolingRackApplicationFactory;
-import org.jruby.rack.SharedRackApplicationFactory;
-import org.jruby.rack.PoolingRackApplicationFactory;
 import org.jruby.rack.RackApplicationFactory;
-import org.jruby.rack.RackConfig;
 import org.jruby.rack.RackServletContextListener;
 
 /**
  *
  * @author nicksieger
  */
 public class RailsServletContextListener extends RackServletContextListener {
-    
+
     @Override
-    protected RackApplicationFactory newApplicationFactory(RackConfig config) {
-        final RackApplicationFactory factory = new RailsRackApplicationFactory();
-        final Integer maxRuntimes = config.getMaximumRuntimes();
-        // TODO maybe after Rails 4 is out switch to shared by default as well !
-        if ( maxRuntimes != null && maxRuntimes.intValue() == 1 ) {
-            return new SharedRackApplicationFactory(factory);
-        } 
-        else {
-            return config.isSerialInitialization() ?
-                new SerialPoolingRackApplicationFactory(factory) :
-                    new PoolingRackApplicationFactory(factory) ;
-        }
+    protected RackApplicationFactory getRealRackApplicationFactoryImpl() {
+        return new RailsRackApplicationFactory();
     }
-    
 }

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

@@ -87,14 +87,16 @@
 
     let(:servlet_context) { new_servlet_context(base_path) }
 
-    it "initializes (pooling by default)" do
+    it "initializes pooling when min/max set" do
+      servlet_context.addInitParameter('jruby.min.runtimes', '1')
+      servlet_context.addInitParameter('jruby.max.runtimes', '2')
+
       listener = org.jruby.rack.rails.RailsServletContextListener.new
       listener.contextInitialized javax.servlet.ServletContextEvent.new(servlet_context)
 
       rack_factory = servlet_context.getAttribute("rack.factory")
       rack_factory.should be_a(RackApplicationFactory)
       rack_factory.should be_a(PoolingRackApplicationFactory)
-      rack_factory.should respond_to(:realFactory)
       rack_factory.realFactory.should be_a(RailsRackApplicationFactory)
 
       servlet_context.getAttribute("rack.context").should be_a(RackContext)
@@ -103,7 +105,19 @@
       rack_factory.getApplication.should be_a(DefaultRackApplication)
     end
 
-    it "initializes threadsafe!" do
+    it "initializes shared (thread-safe) by default" do
+      listener = org.jruby.rack.rails.RailsServletContextListener.new
+      listener.contextInitialized javax.servlet.ServletContextEvent.new(servlet_context)
+
+      rack_factory = servlet_context.getAttribute("rack.factory")
+      rack_factory.should be_a(RackApplicationFactory)
+      rack_factory.should be_a(SharedRackApplicationFactory)
+      rack_factory.realFactory.should be_a(RailsRackApplicationFactory)
+
+      rack_factory.getApplication.should be_a(DefaultRackApplication)
+    end
+
+    it "initializes shared (thread-safe) whem max runtimes is 1" do
       servlet_context.addInitParameter('jruby.max.runtimes', '1')
 
       listener = org.jruby.rack.rails.RailsServletContextListener.new

src/spec/ruby/rack/servlet_context_listener_spec.rb

@@ -113,13 +113,20 @@
     lambda { RailsServletContextListener.new }.should_not raise_error
   end
 
-  it "pools runtimes by default" do
+  it "shares a runtime by default" do
     factory = RailsServletContextListener.new.
       send(:newApplicationFactory, @rack_config)
-    factory.should be_a(org.jruby.rack.PoolingRackApplicationFactory)
+    factory.should be_a(org.jruby.rack.SharedRackApplicationFactory)
   end
 
   it "pools runtimes when max > 1" do
+    @rack_config.stub(:getMaximumRuntimes).and_return(2)
+    factory = RailsServletContextListener.new.
+      send(:newApplicationFactory, @rack_config)
+    factory.should be_a(org.jruby.rack.PoolingRackApplicationFactory)
+  end
+
+  it "pools runtimes when max > 1 and serial initialization" do
     @rack_config.stub(:getMaximumRuntimes).and_return(3)
     @rack_config.stub(:isSerialInitialization).and_return(true)
     factory = RailsServletContextListener.new.