summaryrefslogtreecommitdiff
path: root/lib/timeout.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/timeout.rb')
-rw-r--r--lib/timeout.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/timeout.rb b/lib/timeout.rb
index fec7b9428c..123f600ccb 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -24,8 +24,6 @@
module Timeout
# Raised by Timeout#timeout when the block times out.
class Error < RuntimeError
- end
- class ExitException < ::Exception # :nodoc:
attr_reader :thread
def self.catch(*args)
@@ -46,6 +44,7 @@ module Timeout
self
end
end
+ ExitException = Error
# :stopdoc:
THIS_FILE = /\A#{Regexp.quote(__FILE__)}:/o
@@ -101,7 +100,7 @@ module Timeout
bt = e.backtrace
end
else
- bt = ExitException.catch(message, &bl)
+ bt = Error.catch(message, &bl)
end
rej = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-4}\z/o
bt.reject! {|m| rej =~ m}