diff options
author | Eric Wong <normalperson@yhbt.net> | 2009-03-31 00:28:33 -0700 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2009-03-31 00:28:33 -0700 |
commit | 6ab8a56ed27320746cf6d95a1b3e9fe4ddb99d75 (patch) | |
tree | a78417bf8e89290545d0c314790cbb8dc4af2a9b /bin/unicorn_rails | |
parent | 1c18400490d2567cfa44ae96f319d80415b36587 (diff) | |
download | unicorn-6ab8a56ed27320746cf6d95a1b3e9fe4ddb99d75.tar.gz |
This removes half-implemented support to disable static file serving. People interested enough can provide their own config.ru file to save some stat(2) syscalls, but extra command-config options just complicate things.
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 ba0d690..4299fb5 100755 --- a/bin/unicorn_rails +++ b/bin/unicorn_rails @@ -7,7 +7,6 @@ rails_pid = File.join(Unicorn::HttpServer::DEFAULT_START_CTX[:cwd], "/tmp/pids/unicorn.pid") cmd = File.basename($0) daemonize = false -static = true listeners = [] options = { :listeners => listeners } host, port = Unicorn::Const::DEFAULT_HOST, Unicorn::Const::DEFAULT_PORT @@ -175,17 +174,15 @@ app = lambda do || $stderr.puts "LogTailer not available for Rails < 2.3" unless daemonize $stderr.puts "Debugger not available" if $DEBUG map(map_path) do - if static - require 'unicorn/app/old_rails/static' - use Unicorn::App::OldRails::Static - end + require 'unicorn/app/old_rails/static' + use Unicorn::App::OldRails::Static run inner_app end else use Rails::Rack::LogTailer unless daemonize use Rails::Rack::Debugger if $DEBUG map(map_path) do - use Rails::Rack::Static if static + use Rails::Rack::Static run inner_app end end |