diff options
author | Eric Wong <normalperson@yhbt.net> | 2009-02-26 16:18:56 -0800 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2009-03-03 11:13:01 -0800 |
commit | e66ab79b8b5bc5311c750bf03868a7b2574f4ea1 (patch) | |
tree | 834773540c945b02e625f75e466c2d531b5e97c9 /bin | |
parent | 29cac8016a09f3a0f9e941ca51db3f0a6df98b60 (diff) | |
download | unicorn-e66ab79b8b5bc5311c750bf03868a7b2574f4ea1.tar.gz |
Since not all rackup command-line options can be supported by Unicorn, disable this gross hack to avoid potentially unpredictable or undefined behavior. config.ru will not be able to specify the config file for unicorn-specific options; but the unicorn-specific config files themselves will be allowed to override the default config.ru location.
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/unicorn | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/unicorn b/bin/unicorn index dd4cc64..0956d6f 100755 --- a/bin/unicorn +++ b/bin/unicorn @@ -114,9 +114,8 @@ abort "configuration file #{config} not found" unless File.exist?(config) if config =~ /\.ru$/ cfgfile = File.read(config) - # parse embedded command-line options in config.ru comments if cfgfile[/^#\\(.*)/] - opts.parse! $1.split(/\s+/) + warn %(not parsing embedded command-line options: "#$1") end inner_app = eval "Rack::Builder.new {(#{cfgfile}\n)}.to_app", nil, config else |