diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-12-02 14:12:35 -0600 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-12-02 14:12:35 -0600 |
commit | de2cd8e39f68d874b833b3a4860769c4edc57cbe (patch) | |
tree | eb9ef69f38bf19dc79023971f8be964a95607746 /railties/lib/rails/commands | |
parent | 8db038227ca4cbcba01a86ef5fb94cb13c780463 (diff) | |
parent | c446b1b12b6b54e61136410c6dfe69de3678eae9 (diff) | |
download | rails-de2cd8e39f68d874b833b3a4860769c4edc57cbe.tar.gz rails-de2cd8e39f68d874b833b3a4860769c4edc57cbe.tar.bz2 rails-de2cd8e39f68d874b833b3a4860769c4edc57cbe.zip |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties/lib/rails/commands')
-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 57b7c6a49c..3687b4460e 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) + def initialize(app_const) super() # Call Rack::Server#initialize without passing any options to use. - @app = app + @app_const = app_const end def start @@ -69,7 +69,7 @@ module Rails end def log_path - "#{File.expand_path(@app.root)}/log/#{options[:environment]}.log" + "#{File.expand_path(@app_const.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.root}/config.ru", + :rack_file => "#{@app_const.root}/config.ru", :daemonize => false, :debugger => false, - :pid => "#{@app.root}/tmp/pids/server.pid", + :pid => "#{@app_const.root}/tmp/pids/server.pid", :AccessLog => [] } end |