From 70cb33c214ced1235b8e6077e11177a3ba6b7977 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Sat, 27 Apr 2013 12:16:55 +0300
Subject: Fix timeout on receiving command from input

---
 lib/oxidized/input/telnet.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/oxidized/input')

diff --git a/lib/oxidized/input/telnet.rb b/lib/oxidized/input/telnet.rb
index f946e92..2da459e 100644
--- a/lib/oxidized/input/telnet.rb
+++ b/lib/oxidized/input/telnet.rb
@@ -25,7 +25,11 @@ module Oxidized
       Log.debug "Telnet: #{cmd} @#{@node.name}"
       args = { 'String' => cmd }
       args.merge!({ 'Match' => expect, 'Timeout' => @timeout }) if expect
-      @telnet.cmd args
+      begin
+        @telnet.cmd args
+      rescue Timeout::Error
+        return false
+      end
     end
 
     private
-- 
cgit v1.2.1