mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
5fe2879fd5
commit
17e1cfef8c
3 changed files with 15 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue