diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2009-12-02 11:27:42 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2009-12-02 11:35:47 -0800 |
| commit | 6680f9c4d77537807c3e43c7de85e94f75472d5c (patch) | |
| tree | f762b513005e6aa6e1172d9f7361f5341460642d /railties/lib | |
| parent | fe41c7030b0a196600378418df4c59588ca1b4f8 (diff) | |
| download | rails-6680f9c4d77537807c3e43c7de85e94f75472d5c.tar.gz rails-6680f9c4d77537807c3e43c7de85e94f75472d5c.tar.bz2 rails-6680f9c4d77537807c3e43c7de85e94f75472d5c.zip | |
Fix an ivar name conflict in Rails::Server
Diffstat (limited to 'railties/lib')
| -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 |