Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed CTRL-C exists from the Breakpointer to be a clean affair withou…

…t error dumping [Kent Sibilev]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@246 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 78c6de9daf7970ae40d50899ee0ceb67c0297a94 1 parent ebf2b12
@dhh dhh authored
Showing with 8 additions and 1 deletion.
  1. +2 −0  railties/CHANGELOG
  2. +6 −1 railties/lib/breakpoint_client.rb
View
2  railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed CTRL-C exists from the Breakpointer to be a clean affair without error dumping [Kent Sibilev]
+
* Fixed "rake stats" to work with sub-directories in models and controllers and to report the code to test ration [Scott Baron]
* Added that Active Record associations are now reloaded instead of cleared to work with the new const_missing hook in Active Record.
View
7 railties/lib/breakpoint_client.rb
@@ -62,6 +62,10 @@
options[:ServerURI] = ARGV[0] if ARGV[0]
+$running = true
+
+trap("INT"){$running = false}
+
puts "Waiting for initial breakpoint..."
loop do
@@ -138,7 +142,7 @@
puts "Connection established. Waiting for breakpoint...", "" if options[:Verbose]
- loop do
+ while $running
begin
service.ping
rescue DRb::DRbConnError => error
@@ -152,6 +156,7 @@
service.unregister_handler
end
rescue Exception => error
+ break unless $running
if options[:RetryDelay] > 0 then
puts "No connection to breakpoint service at #{options[:ServerURI]}:", " (#{error.inspect})" if options[:Verbose]
error.backtrace if $DEBUG
Please sign in to comment.
Something went wrong with that request. Please try again.