diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-04-28 15:57:29 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-04-28 15:57:29 +0000 |
| commit | 70ac560e42644938392381ecd52efd7fb0260323 (patch) | |
| tree | dbc0bc73d480bf3af99aef2f4be16afa183f4850 /railties/lib/fcgi_handler.rb | |
| parent | 1d5c34c2c27370356e8cd1ef478111802b6a5af4 (diff) | |
| download | rails-70ac560e42644938392381ecd52efd7fb0260323.tar.gz rails-70ac560e42644938392381ecd52efd7fb0260323.tar.bz2 rails-70ac560e42644938392381ecd52efd7fb0260323.zip | |
Removed breakpointer and Binding.of_caller in favor of relying on ruby-debug by Kent Sibilev since the breakpointer has been broken since Ruby 1.8.4 and will not be coming back [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6611 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/fcgi_handler.rb')
| -rw-r--r-- | railties/lib/fcgi_handler.rb | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/railties/lib/fcgi_handler.rb b/railties/lib/fcgi_handler.rb index d7e95b8fbe..85e5ca99b3 100644 --- a/railties/lib/fcgi_handler.rb +++ b/railties/lib/fcgi_handler.rb @@ -9,8 +9,7 @@ class RailsFCGIHandler 'INT' => :exit_now, 'TERM' => :exit_now, 'USR1' => :exit, - 'USR2' => :restart, - 'SIGTRAP' => :breakpoint + 'USR2' => :restart } GLOBAL_SIGNALS = SIGNALS.keys - %w(USR1) @@ -131,11 +130,6 @@ class RailsFCGIHandler @when_ready = :restart end - def breakpoint_handler(signal) - dispatcher_log :info, "asked to breakpoint ASAP" - @when_ready = :breakpoint - end - def process_each_request!(provider) cgi = nil provider.each_cgi do |cgi| @@ -152,9 +146,6 @@ class RailsFCGIHandler when :exit close_connection(cgi) break - when :breakpoint - close_connection(cgi) - breakpoint! end gc_countdown @@ -198,15 +189,6 @@ class RailsFCGIHandler ActionController::Routing::Routes.reload end - def breakpoint! - require 'breakpoint' - port = defined?(BREAKPOINT_SERVER_PORT) ? BREAKPOINT_SERVER_PORT : 42531 - Breakpoint.activate_drb("druby://localhost:#{port}", nil, !defined?(FastCGI)) - dispatcher_log :info, "breakpointing" - breakpoint - @when_ready = nil - end - def run_gc! @gc_request_countdown = gc_request_period GC.enable; GC.start; GC.disable |