diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 17:37:49 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 17:37:49 +0000 |
commit | dbb6403923ff1f20d0a3090041043d16740450f7 (patch) | |
tree | 53c4441d9871d90e63cd18109daa3c70bf418890 /railties/lib | |
parent | 6b4226918396304bdc480e7e2e373e787d925164 (diff) | |
download | rails-dbb6403923ff1f20d0a3090041043d16740450f7.tar.gz rails-dbb6403923ff1f20d0a3090041043d16740450f7.tar.bz2 rails-dbb6403923ff1f20d0a3090041043d16740450f7.zip |
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
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/dispatcher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 275c062ffe..140d8e84a3 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -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 |