summaryrefslogtreecommitdiff
path: root/lib/oxidized
diff options
context:
space:
mode:
authorSaku Ytti <saku@ytti.fi>2014-03-02 13:11:51 +0200
committerSaku Ytti <saku@ytti.fi>2014-03-02 13:11:51 +0200
commitf7ba5b70aa0222e4f4c75696fbd487a6b0d4e703 (patch)
tree188f91d28c11f83fa2598667d195d73dd6743f25 /lib/oxidized
parent4baedb0667185fb899ad1c1f5a7782d1228807a9 (diff)
Give up after timeout on SSH#expect
Diffstat (limited to 'lib/oxidized')
-rw-r--r--lib/oxidized/input/ssh.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb
index 24401dd..a0a5916 100644
--- a/lib/oxidized/input/ssh.rb
+++ b/lib/oxidized/input/ssh.rb
@@ -1,5 +1,6 @@
module Oxidized
require 'net/ssh'
+ require 'timeout'
require 'oxidized/input/cli'
class SSH < Input
RescueFail = {
@@ -83,9 +84,11 @@ module Oxidized
end
def expect regexp
- @ssh.loop(0.1) do
- sleep 0.1
- not @output.match regexp
+ Timeout::timeout(CFG.timeout) do
+ @ssh.loop(0.1) do
+ sleep 0.1
+ not @output.match regexp
+ end
end
end