From 17a9fb3d013912eea2a1e834bc0480b677592d71 Mon Sep 17 00:00:00 2001 From: Samer Abdel-Hafez Date: Wed, 1 May 2013 12:45:11 +0100 Subject: add latest changes --- lib/oxidized/input/ssh.rb | 2 +- lib/oxidized/input/telnet.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/oxidized/input') diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb index 3d14a57..430eaa2 100644 --- a/lib/oxidized/input/ssh.rb +++ b/lib/oxidized/input/ssh.rb @@ -12,7 +12,7 @@ module Oxidized begin @ssh = Net::SSH.start @node.ip, @node.auth[:username], :password => @node.auth[:password], :timeout => CFG.timeout - rescue Timeout::Error, Net::SSH::Disconnect, Errno::ECONNREFUSED + rescue Timeout::Error, Errno::ECONNREFUSED, Errno::ECONNRESET, Net::SSH::Disconnect return false end open_shell @ssh unless @exec diff --git a/lib/oxidized/input/telnet.rb b/lib/oxidized/input/telnet.rb index c1afde2..f1222d8 100644 --- a/lib/oxidized/input/telnet.rb +++ b/lib/oxidized/input/telnet.rb @@ -17,7 +17,7 @@ module Oxidized expect password @telnet.puts @node.auth[:password] expect @node.prompt - rescue Errno::ECONNREFUSED, Timeout::Error + rescue Timeout::Error, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EHOSTUNREACH return false end end @@ -28,7 +28,7 @@ module Oxidized args.merge!({ 'Match' => expect, 'Timeout' => @timeout }) if expect begin @telnet.cmd args - rescue Timeout::Error, Errno::ECONNRESET + rescue Timeout::Error, Errno::ECONNRESET, Errno::EPIPE return false end end -- cgit v1.2.1