summaryrefslogtreecommitdiff
path: root/lib/oxidized/hook/exec.rb
diff options
context:
space:
mode:
authorWild Kat <wk@futureinquestion.net>2018-04-27 12:37:26 +0200
committerWild Kat <wk@futureinquestion.net>2018-04-27 12:37:26 +0200
commit8f1ac4ad5503ac4a59d41ebc3f142c1d5d097bfb (patch)
tree8860b268793dd783b9b5cd5d1a255fe1edebfb0e /lib/oxidized/hook/exec.rb
parentcd92bac4a582eb8e19d9d036455591c9684eae72 (diff)
parent34fd5369feee94ab45c5a81d7769b1df717e4c8c (diff)
Merge remote-tracking branch 'upstream/master' into pr-1280
Diffstat (limited to 'lib/oxidized/hook/exec.rb')
-rw-r--r--lib/oxidized/hook/exec.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/oxidized/hook/exec.rb b/lib/oxidized/hook/exec.rb
index 3f984c2..8a32412 100644
--- a/lib/oxidized/hook/exec.rb
+++ b/lib/oxidized/hook/exec.rb
@@ -23,10 +23,9 @@ class Exec < Oxidized::Hook
@cmd = cfg.cmd
raise "invalid cmd value" unless @cmd.is_a?(String) || @cmd.is_a?(Array)
end
-
rescue RuntimeError => e
raise ArgumentError,
- "#{self.class.name}: configuration invalid: #{e.message}"
+ "#{self.class.name}: configuration invalid: #{e.message}"
end
def run_hook ctx
@@ -45,7 +44,7 @@ class Exec < Oxidized::Hook
def run_cmd! env
pid, status = nil, nil
Timeout.timeout(@timeout) do
- pid = spawn env, @cmd , :unsetenv_others => true
+ pid = spawn env, @cmd, :unsetenv_others => true
pid, status = wait2 pid
unless status.exitstatus.zero?
msg = "#{@cmd.inspect} failed with exit value #{status.exitstatus}"