diff options
author | Carlhuda <carlhuda@engineyard.com> | 2009-12-23 19:18:11 -0800 |
---|---|---|
committer | Carlhuda <carlhuda@engineyard.com> | 2009-12-23 19:18:11 -0800 |
commit | 84f1137ef87ff3c8e7cff5e8363d1f116b23fcae (patch) | |
tree | d6fe70688d13cbb24302175d348a997ed955ad51 /railties/lib/rails/commands/server.rb | |
parent | c4d6d50a46a0fe53f75aadc306212b5437e22ed8 (diff) | |
parent | 7a6f73e79b850e05d8d9639310159679ef872fb7 (diff) | |
download | rails-84f1137ef87ff3c8e7cff5e8363d1f116b23fcae.tar.gz rails-84f1137ef87ff3c8e7cff5e8363d1f116b23fcae.tar.bz2 rails-84f1137ef87ff3c8e7cff5e8363d1f116b23fcae.zip |
Merge remote branch 'origin/master'
Conflicts:
railties/lib/rails/application.rb
Diffstat (limited to 'railties/lib/rails/commands/server.rb')
-rw-r--r-- | railties/lib/rails/commands/server.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 3687b4460e..57b7c6a49c 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -41,9 +41,9 @@ module Rails new(app).start end - def initialize(app_const) + def initialize(app) super() # Call Rack::Server#initialize without passing any options to use. - @app_const = app_const + @app = app end def start @@ -69,7 +69,7 @@ module Rails end def log_path - "#{File.expand_path(@app_const.root)}/log/#{options[:environment]}.log" + "#{File.expand_path(@app.root)}/log/#{options[:environment]}.log" end def default_options @@ -77,10 +77,10 @@ module Rails :Port => 3000, :Host => "0.0.0.0", :environment => (ENV['RAILS_ENV'] || "development").dup, - :rack_file => "#{@app_const.root}/config.ru", + :rack_file => "#{@app.root}/config.ru", :daemonize => false, :debugger => false, - :pid => "#{@app_const.root}/tmp/pids/server.pid", + :pid => "#{@app.root}/tmp/pids/server.pid", :AccessLog => [] } end |