mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Added exception shallowing if the DRb server can't be started (not worth making a fuss about to distract new users) #779 [Tobias Luetke]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@864 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
6b42269183
commit
dbb6403923
2 changed files with 3 additions and 1 deletions
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Added exception shallowing if the DRb server can't be started (not worth making a fuss about to distract new users) #779 [Tobias Luetke]
|
||||
|
||||
* Added an empty favicon.ico file to the public directory of new applications (so the logs are not spammed by its absence)
|
||||
|
||||
* Fixed that scaffold generator new template should use local variable instead of instance variable #778 [Dan Peterson]
|
||||
|
|
|
@ -40,7 +40,7 @@ class Dispatcher
|
|||
private
|
||||
def prepare_application
|
||||
ActionController::Routing::Routes.reload if Dependencies.load?
|
||||
Breakpoint.activate_drb("druby://localhost:#{BREAKPOINT_SERVER_PORT}", nil, !defined?(FastCGI)) if defined?(BREAKPOINT_SERVER_PORT)
|
||||
Breakpoint.activate_drb("druby://localhost:#{BREAKPOINT_SERVER_PORT}", nil, !defined?(FastCGI)) if defined?(BREAKPOINT_SERVER_PORT) rescue nil
|
||||
Controllers.const_load!(:ApplicationController, "application") unless Controllers.const_defined?(:ApplicationController)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue