Permalink
Browse files

Fix an ivar name conflict in Rails::Server

  • Loading branch information...
1 parent fe41c70 commit 6680f9c4d77537807c3e43c7de85e94f75472d5c Carlhuda committed Dec 2, 2009
Showing with 5 additions and 5 deletions.
  1. +5 −5 railties/lib/rails/commands/server.rb
@@ -41,9 +41,9 @@ def self.start(app)
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,18 +69,18 @@ def middleware
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
{
: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

0 comments on commit 6680f9c

Please sign in to comment.