diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-09-25 21:40:55 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-09-25 21:40:55 -0500 |
commit | dfbd3b94094d54483a47faa9d927370df476f572 (patch) | |
tree | a51a222e698722ecb4a4618dd73a0b691ca0098d /railties/lib/rails/commands/server.rb | |
parent | accd9b4634f1a2f220bc3e38cf5c4add04186fe6 (diff) | |
download | rails-dfbd3b94094d54483a47faa9d927370df476f572.tar.gz rails-dfbd3b94094d54483a47faa9d927370df476f572.tar.bz2 rails-dfbd3b94094d54483a47faa9d927370df476f572.zip |
Extract "parse_config" into AD
Diffstat (limited to 'railties/lib/rails/commands/server.rb')
-rw-r--r-- | railties/lib/rails/commands/server.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 743e5a0b07..25f5a8ada5 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -58,23 +58,11 @@ end ENV["RAILS_ENV"] = options[:environment] RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV) -config = options[:config] -if config =~ /\.ru$/ - cfgfile = File.read(config) - if cfgfile[/^#\\(.*)/] - opts.parse!($1.split(/\s+/)) - end - inner_app = eval("Rack::Builder.new {( " + cfgfile + "\n )}.to_app", nil, config) -else - require config - inner_app = Object.const_get(File.basename(config, '.rb').capitalize) -end - app = Rack::Builder.new { use Rails::Rack::LogTailer unless options[:detach] use Rails::Rack::Debugger if options[:debugger] use Rails::Rack::Static - run inner_app + run ActionDispatch::Utils.parse_config(options[:config]) }.to_app puts "=> Call with -d to detach" |