diff options
author | Micah Chalmer <micah@micahchalmer.net> | 2013-06-06 23:03:36 -0400 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2013-06-07 09:16:57 +0000 |
commit | 56b0c0c3d26304beeef54d8fe95bead97424f147 (patch) | |
tree | fafd4255bcdb39fc8c3f6482174aad77029e1134 /lib/unicorn.rb | |
parent | 421f5a8573484b1203fceebc65aee5d011d63c63 (diff) | |
download | unicorn-56b0c0c3d26304beeef54d8fe95bead97424f147.tar.gz |
This fixes the -N (a.k.a. --no-defaut-middleware) option, which was not working. The problem was that Unicorn::Configurator::RACKUP is cleared before the lambda returned by Unicorn.builder is run, which means that checking whether the :no_default_middleware option was set from the lambda could not detect anything. This patch copies it to a local variable that won't get clobbered, restoring the feature. [ew: squashed test commit into the fix, whitespace fixes] Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'lib/unicorn.rb')
-rw-r--r-- | lib/unicorn.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/unicorn.rb b/lib/unicorn.rb index f0ceffe..2535159 100644 --- a/lib/unicorn.rb +++ b/lib/unicorn.rb @@ -35,6 +35,10 @@ module Unicorn # allow Configurator to parse cli switches embedded in the ru file op = Unicorn::Configurator::RACKUP.merge!(:file => ru, :optparse => op) + # 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 || inner_app = case ru @@ -49,7 +53,7 @@ module Unicorn pp({ :inner_app => inner_app }) if $DEBUG - return inner_app if op[:no_default_middleware] + return inner_app if no_default_middleware # return value, matches rackup defaults based on env # Unicorn does not support persistent connections, but Rainbows! |