diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-07 08:21:56 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-07 08:21:56 +0000 |
commit | 047ca4ba1a690d28eaa752abb3f19d7f0aad21fe (patch) | |
tree | 8421da14e206306449166ff9b82750db207fa9f4 /lib | |
parent | 62e8ceae1126ecaeb47e89c725b223a91751afe6 (diff) | |
download | ruby-047ca4ba1a690d28eaa752abb3f19d7f0aad21fe.tar.gz |
timeout.rb: custom error message
* lib/timeout.rb (Timeout#timeout): add custom error message
argument. [Feature #11650]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/timeout.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/timeout.rb b/lib/timeout.rb index 792a7c1093..8d81b596ca 100644 --- a/lib/timeout.rb +++ b/lib/timeout.rb @@ -60,6 +60,8 @@ module Timeout # value of 0 or +nil+ will execute the block without any timeout. # +klass+:: Exception Class to raise if the block fails to terminate # in +sec+ seconds. Omitting will use the default, Timeout::Error + # +message+:: Error message to rasise with Exception Class. + # Omitting will use the default, "execution expired" # # Returns the result of the block *if* the block completed before # +sec+ seconds, otherwise throws an exception, based on the value of +klass+. @@ -70,9 +72,9 @@ module Timeout # Note that this is both a method of module Timeout, so you can <tt>include # Timeout</tt> into your classes so they have a #timeout method, as well as # a module method, so you can call it directly as Timeout.timeout(). - def timeout(sec, klass = nil) #:yield: +sec+ + def timeout(sec, klass = nil, message = nil) #:yield: +sec+ return yield(sec) if sec == nil or sec.zero? - message = "execution expired".freeze + message ||= "execution expired".freeze from = "from #{caller_locations(1, 1)[0]}" if $DEBUG e = Error bl = proc do |exception| |