* lib/timeout.rb (timeout): new optional argument to specify an

exception class.

* lib/resolv.rb: use Resolv::ResolvTimeout for internal timeout to
avoid problem with timeout of application.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/timeout.rb b/lib/timeout.rb
index afa4e0b68c..8c6ccb7128 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -28,13 +28,13 @@
 class TimeoutError<Interrupt
 end
 
-def timeout(sec)
+def timeout(sec, exception=TimeoutError)
   return yield if sec == nil
   begin
     x = Thread.current
     y = Thread.start {
       sleep sec
-      x.raise TimeoutError, "execution expired" if x.alive?
+      x.raise exception, "execution expired" if x.alive?
     }
     yield sec
 #    return true