diff options
| author | Eric Wong <normalperson@yhbt.net> | 2010-06-10 08:47:10 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2010-06-10 09:46:54 +0000 |
| commit | 4accf4449390c649bce0b1c9d84314d65fd41f8e (patch) | |
| tree | 524a01dc72bb030de496986d29cdbc8183ce4919 /lib/unicorn.rb | |
| parent | bff55e030fa3dcd4ac24ec481a67d6f327d67797 (diff) | |
| download | unicorn-4accf4449390c649bce0b1c9d84314d65fd41f8e.tar.gz | |
Since we added support for the "working_directory" parameter, it often became unclear where/when certain paths would be bound. There are some extremely nasty dependencies and ordering issues when doing this. It's all pretty fragile, but works for now and we even have a full integration test to keep it working. I plan on cleaning this up 2.x.x to be less offensive to look at (Rainbows! and Zbatery are a bit tied to this at the moment). Thanks to Pierre Baillet for reporting this. ref: http://mid.gmane.org/AANLkTimKb7JARr_69nfVrJLvMZH3Gvs1o_KwZFLKfuxy@mail.gmail.com
Diffstat (limited to 'lib/unicorn.rb')
| -rw-r--r-- | lib/unicorn.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/unicorn.rb b/lib/unicorn.rb index c026236..a7b0646 100644 --- a/lib/unicorn.rb +++ b/lib/unicorn.rb @@ -33,11 +33,10 @@ module Unicorn # Unicorn config). The returned lambda will be called when it is # time to build the app. def builder(ru, opts) - if ru =~ /\.ru\z/ - # parse embedded command-line options in config.ru comments - /^#\\(.*)/ =~ File.read(ru) and opts.parse!($1.split(/\s+/)) - end + # allow Configurator to parse cli switches embedded in the ru file + Unicorn::Configurator::RACKUP.update(:file => ru, :optparse => opts) + # always called after config file parsing, may be called after forking lambda do || inner_app = case ru when /\.ru$/ |