Jeremy Evans <c...@jeremyevans.net> wrote: > OK. To implement that, I modified the bin/unicorn file so -N > is only respected while parsing ARGV, and not while parsing > embedded configuration file options.
Thanks. Unfortunately, -N on the command-line was broken by your patch. I fixed configurator.rb ordering (below) to pass t0300 integration test. Also, using a non-config.ru .rb file (TestHandler in test/unit/test_server.rb) was broken because of missing parentheses. Will squash the following changes in before pushing: diff --git a/lib/unicorn/configurator.rb b/lib/unicorn/configurator.rb index 9c36dfe..d426edf 100644 --- a/lib/unicorn/configurator.rb +++ b/lib/unicorn/configurator.rb @@ -88,6 +88,9 @@ def reload(merge_defaults = true) #:nodoc: 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 @@ -714,9 +717,6 @@ def parse_rackup_file # :nodoc: /^#\\(.*)/ =~ File.read(ru) or return RACKUP[:optparse].parse!($1.split(/\s+/)) - if RACKUP[:no_default_middleware] - set[:default_middleware] = false - end if RACKUP[:daemonize] # unicorn_rails wants a default pid path, (not plain 'unicorn') diff --git a/lib/unicorn/http_server.rb b/lib/unicorn/http_server.rb index 7531886..62f6171 100644 --- a/lib/unicorn/http_server.rb +++ b/lib/unicorn/http_server.rb @@ -786,7 +786,7 @@ def listener_names(listeners = LISTENERS) end def build_app! - if app.respond_to?(:arity) && app.arity == 0 || app.arity == 2 + 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 But there's still no tests for the config file option... I assume you tested that part locally? Thanks again. -- unsubscribe: unicorn-public+unsubscr...@bogomips.org archive: https://bogomips.org/unicorn-public/