about summary refs log tree commit homepage
diff options
authorMicah Chalmer <micah@micahchalmer.net>2013-06-06 23:03:36 -0400
committerEric Wong <normalperson@yhbt.net>2013-06-07 09:16:57 +0000
commit56b0c0c3d26304beeef54d8fe95bead97424f147 (patch)
parent421f5a8573484b1203fceebc65aee5d011d63c63 (diff)
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>
3 files changed, 25 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!
diff --git a/t/fails-rack-lint.ru b/t/fails-rack-lint.ru
new file mode 100644
index 0000000..82bfb5f
--- /dev/null
+++ b/t/fails-rack-lint.ru
@@ -0,0 +1,5 @@
+# This rack app returns an invalid status code, which will cause
+# Rack::Lint to throw an exception if it is present.  This
+# is used to check whether Rack::Lint is in the stack or not.
+run lambda {|env| return [42, {}, ["Rack::Lint wasn't there if you see this"]]}
diff --git a/t/t0300-no-default-middleware.sh b/t/t0300-no-default-middleware.sh
new file mode 100644
index 0000000..c017c16
--- /dev/null
+++ b/t/t0300-no-default-middleware.sh
@@ -0,0 +1,15 @@
+. ./test-lib.sh
+t_plan 2 "test the -N / --no-default-middleware option"
+t_begin "setup and start" && {
+        unicorn_setup
+        unicorn -N -D -c $unicorn_config fails-rack-lint.ru
+        unicorn_wait_start
+t_begin "check exit status with Rack::Lint not present" && {
+        test 42 -eq "$(curl -sf -o/dev/null -w'%{http_code}' http://$listen/)"