summaryrefslogtreecommitdiff
path: root/lib/oxidized/hook
diff options
context:
space:
mode:
authorWild Kat <wk@futureinquestion.net>2018-04-27 17:11:42 +0200
committerWild Kat <wk@futureinquestion.net>2018-04-27 17:11:42 +0200
commitae9c7c2a65d65bea136669bc9cbc2d645841a017 (patch)
tree0979993d8976009ce915e8df9ec6c49da09781f5 /lib/oxidized/hook
parent1311573a1adff6edf2c0b3cfdb05ca83d6c46e73 (diff)
transition from TimeoutError to Timeout::Error
Diffstat (limited to 'lib/oxidized/hook')
-rw-r--r--lib/oxidized/hook/exec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/oxidized/hook/exec.rb b/lib/oxidized/hook/exec.rb
index 8a32412..069b888 100644
--- a/lib/oxidized/hook/exec.rb
+++ b/lib/oxidized/hook/exec.rb
@@ -52,11 +52,11 @@ class Exec < Oxidized::Hook
raise msg
end
end
- rescue TimeoutError
+ rescue Timeout::Error
kill "TERM", pid
msg = "#{@cmd} timed out"
log msg, :error
- raise TimeoutError, msg
+ raise Timeout::Error, msg
end
def make_env ctx