diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/unicorn.rb | 8 | ||||
-rw-r--r-- | lib/unicorn/configurator.rb | 11 | ||||
-rw-r--r-- | lib/unicorn/http_server.rb | 8 |
3 files changed, 18 insertions, 9 deletions
diff --git a/lib/unicorn.rb b/lib/unicorn.rb index b6dae36..5f2134d 100644 --- a/lib/unicorn.rb +++ b/lib/unicorn.rb @@ -45,12 +45,8 @@ module Unicorn abort "rack and Rack::Builder must be available for processing #{ru}" end - # Op is going to get cleared before the returned lambda is called, so - # save this value so that it's still there when we need it: - no_default_middleware = op[:no_default_middleware] - # always called after config file parsing, may be called after forking - lambda do || + lambda do |_, server| inner_app = case ru when /\.ru$/ raw = File.read(ru) @@ -66,7 +62,7 @@ module Unicorn pp({ :inner_app => inner_app }) end - return inner_app if no_default_middleware + return inner_app unless server.default_middleware middleware = { # order matters ContentLength: nil, diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb index f34d38b..d426edf 100644 --- a/lib/unicorn/configurator.rb +++ b/lib/unicorn/configurator.rb @@ -88,6 +88,9 @@ class Unicorn::Configurator RACKUP[:set_listener] and set[:listeners] << "#{RACKUP[:host]}:#{RACKUP[:port]}" + RACKUP[:no_default_middleware] and + set[:default_middleware] = false + # unicorn_rails creates dirs here after working_directory is bound after_reload.call if after_reload @@ -265,6 +268,14 @@ class Unicorn::Configurator set_int(:worker_processes, nr, 1) end + # sets whether to add default middleware in the development and + # deployment RACK_ENVs. + # + # default_middleware is only available in unicorn 5.5.0+ + def default_middleware(bool) + set_bool(:default_middleware, bool) + end + # sets listeners to the given +addresses+, replacing or augmenting the # current set. This is for the global listener pool shared by all # worker processes. For per-worker listeners, see the after_fork example diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb index b2bbddb..62f6171 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -14,7 +14,8 @@ class Unicorn::HttpServer attr_accessor :app, :timeout, :worker_processes, :before_fork, :after_fork, :before_exec, :listener_opts, :preload_app, - :orig_app, :config, :ready_pipe, :user + :orig_app, :config, :ready_pipe, :user, + :default_middleware attr_writer :after_worker_exit, :after_worker_ready, :worker_exec attr_reader :pid, :logger @@ -70,6 +71,7 @@ class Unicorn::HttpServer @app = app @request = Unicorn::HttpRequest.new @reexec_pid = 0 + @default_middleware = true options = options.dup @ready_pipe = options.delete(:ready_pipe) @init_listeners = options[:listeners] ? options[:listeners].dup : [] @@ -784,12 +786,12 @@ class Unicorn::HttpServer end def build_app! - if app.respond_to?(:arity) && app.arity == 0 + if app.respond_to?(:arity) && (app.arity == 0 || app.arity == 2) if defined?(Gem) && Gem.respond_to?(:refresh) logger.info "Refreshing Gem list" Gem.refresh end - self.app = app.call + self.app = app.arity == 0 ? app.call : app.call(nil, self) end end |