diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/timeout.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Dec 6 00:51:21 2012 Masaya Tarui <tarui@ruby-lang.org> + + * lib/timeout.rb (Timeout#timeout): specify a exception + more strictly at async_interrupt_timing. + Wed Dec 5 04:50:17 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * lib/timeout.rb (Timeout#timeout): set diff --git a/lib/timeout.rb b/lib/timeout.rb index da4eae39a1..ee20115754 100644 --- a/lib/timeout.rb +++ b/lib/timeout.rb @@ -49,8 +49,8 @@ module Timeout # a module method, so you can call it directly as Timeout.timeout(). def timeout(sec, klass = nil, immediate: false) #:yield: +sec+ return yield(sec) if sec == nil or sec.zero? - Thread.async_interrupt_timing(klass ? klass : ExitException => immediate ? :immediate : :on_blocking) do - exception = klass || Class.new(ExitException) + exception = klass || Class.new(ExitException) + Thread.async_interrupt_timing(exception => immediate ? :immediate : :on_blocking) do begin begin x = Thread.current |