From baa0709812a6204686228c1fb9be1df69045383f Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 15 Aug 2009 01:48:59 -0700 Subject: Make launchers __END__-aware I've noticed rackup has been __END__-aware as of 7b6046b764eafd332b3b2d9d93b3915c425fae54 in Rack upstream --- bin/unicorn | 1 + bin/unicorn_rails | 1 + 2 files changed, 2 insertions(+) diff --git a/bin/unicorn b/bin/unicorn index a34d9bc..cfc81da 100755 --- a/bin/unicorn +++ b/bin/unicorn @@ -124,6 +124,7 @@ app = lambda do || inner_app = case config when /\.ru$/ raw = File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) } + raw.sub!(/^__END__\n.*/, '') eval("Rack::Builder.new {(#{raw}\n)}.to_app", nil, config) else require config diff --git a/bin/unicorn_rails b/bin/unicorn_rails index b3fda7b..a0035f4 100755 --- a/bin/unicorn_rails +++ b/bin/unicorn_rails @@ -148,6 +148,7 @@ app = lambda do || end when /\.ru$/ raw = File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) } + raw.sub!(/^__END__\n.*/, '') eval("Rack::Builder.new {(#{raw}\n)}.to_app", nil, config) else require config -- cgit v1.2.3-24-ge0c7