diff options
author | Samer Abdel-Hafez <sam@arahant.net> | 2013-10-25 15:00:13 -0700 |
---|---|---|
committer | Samer Abdel-Hafez <sam@arahant.net> | 2013-10-25 15:00:13 -0700 |
commit | 056ecb1a94d24085497d1baa304645390052e50b (patch) | |
tree | 96764af0bcc7980c66779f7ef42e832df88982d5 /lib/oxidized/input | |
parent | feba4c2b9e0faeb40cad32f16d7b024a2d4327ae (diff) | |
parent | 4455a5b91accda5da7c1b8128cb045c7eb7bb5da (diff) |
Merge pull request #1 from ytti/master
update local branch
Diffstat (limited to 'lib/oxidized/input')
-rw-r--r-- | lib/oxidized/input/ssh.rb | 2 | ||||
-rw-r--r-- | lib/oxidized/input/telnet.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/oxidized/input/ssh.rb b/lib/oxidized/input/ssh.rb index c0594db..dc90354 100644 --- a/lib/oxidized/input/ssh.rb +++ b/lib/oxidized/input/ssh.rb @@ -39,7 +39,7 @@ module Oxidized disconnect_cli @ssh.loop @ssh.close if not @ssh.closed? - rescue Net::SSH::Disconnect + rescue Errno::ECONNRESET, Net::SSH::Disconnect end end diff --git a/lib/oxidized/input/telnet.rb b/lib/oxidized/input/telnet.rb index c4c8bab..26755ca 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 Timeout::Error, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EHOSTUNREACH + rescue Timeout::Error, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EPIPE, Errno::EHOSTUNREACH return false end end |