Move debugger into middleware

1 files changed, 1 insertions, 12 deletions

diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb
index f61c48567f..a4bb52592f 100644
--- a/railties/lib/commands/server.rb
+++ b/railties/lib/commands/server.rb
@@ -83,22 +83,11 @@ else
   app = Rack::Builder.new {
     use Rails::Rack::Logger
     use Rails::Rack::Static
+    use Rails::Rack::Debugger if options[:debugger]
     run ActionController::Dispatcher.new
   }.to_app
 end
 
-if options[:debugger]
-  begin
-    require_library_or_gem 'ruby-debug'
-    Debugger.start
-    Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
-    puts "=> Debugger enabled"
-  rescue Exception
-    puts "You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'"
-    exit
-  end
-end
-
 puts "=> Call with -d to detach"
 
 trap(:INT) { exit }