diff options
| author | ytti <saku@ytti.fi> | 2018-04-27 18:23:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 18:23:24 +0300 |
| commit | 9afd5fe024a4ad5058626d2412719e7888104964 (patch) | |
| tree | b0eaa466bbb3d0b28e9a5ca99b0f855f2ccd07b8 /lib/oxidized/hook | |
| parent | 41c7e965e0f78600d4baf2da1e4720f44c06233c (diff) | |
| parent | ae9c7c2a65d65bea136669bc9cbc2d645841a017 (diff) | |
Merge pull request #1315 from wk/potato-potato
transition from TimeoutError to Timeout::Error
Diffstat (limited to 'lib/oxidized/hook')
| -rw-r--r-- | lib/oxidized/hook/exec.rb | 4 |
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 |