diff options
Diffstat (limited to 'lib/unicorn.rb')
| -rw-r--r-- | lib/unicorn.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/unicorn.rb b/lib/unicorn.rb index f9aa73a..9349e49 100644 --- a/lib/unicorn.rb +++ b/lib/unicorn.rb @@ -31,9 +31,9 @@ module Unicorn # app (which we defer based on the outcome of "preload_app" in the # Unicorn config). The returned lambda will be called when it is # time to build the app. - def self.builder(ru, opts) + def self.builder(ru, op) # allow Configurator to parse cli switches embedded in the ru file - Unicorn::Configurator::RACKUP.update(:file => ru, :optparse => opts) + op = Unicorn::Configurator::RACKUP.merge!(:file => ru, :optparse => op) # always called after config file parsing, may be called after forking lambda do || |