From 047ca4ba1a690d28eaa752abb3f19d7f0aad21fe Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 7 Sep 2016 08:21:56 +0000 Subject: 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 --- lib/timeout.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/timeout.rb') 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 include # Timeout 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| -- cgit v1.2.3