diff options
author | Eric Wong <normalperson@yhbt.net> | 2010-02-28 19:20:11 -0800 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2010-02-28 19:20:11 -0800 |
commit | a4a8bf7604d1c15c5a8fb9cb6be37e8bccb32e52 (patch) | |
tree | 56486ea2e59414f4a4e97109309ed69e7dec7cdb /bin/unicorn_rails | |
parent | 947b8e5d312446b63a7dbd5be51a1bebf421cea8 (diff) | |
download | unicorn-a4a8bf7604d1c15c5a8fb9cb6be37e8bccb32e52.tar.gz |
Do not assume the user wants config.ru to be Encoding::BINARY for 1.9.
Diffstat (limited to 'bin/unicorn_rails')
-rwxr-xr-x | bin/unicorn_rails | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/bin/unicorn_rails b/bin/unicorn_rails index a27e9df..4406a34 100755 --- a/bin/unicorn_rails +++ b/bin/unicorn_rails @@ -110,15 +110,11 @@ end config = ARGV[0] || (File.exist?('config.ru') ? 'config.ru' : nil) -if config && config =~ /\.ru$/ +if config && config =~ /\.ru\z/ # parse embedded command-line options in config.ru comments - if File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) } =~ /^#\\(.*)/ - opts.parse! $1.split(/\s+/) - end + /^#\\(.*)/ =~ File.read(config) and opts.parse!($1.split(/\s+/)) end -require 'pp' if $DEBUG - def rails_builder(config, daemonize) # this lambda won't run until after forking if preload_app is false lambda do || @@ -185,6 +181,7 @@ def rails_builder(config, daemonize) end app = rails_builder(config, daemonize) +require 'pp' if $DEBUG listeners << "#{host}:#{port}" if set_listener |