Fix timeout on receiving command from input

2 files changed, 9 insertions, 2 deletions

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
diff --git a/lib/oxidized/model/model.rb b/lib/oxidized/model/model.rb
index fb27143..8f7b14f 100644
--- a/lib/oxidized/model/model.rb
+++ b/lib/oxidized/model/model.rb
@@ -40,6 +40,7 @@ module Oxidized
 
     def cmd string, &block
       out = @input.cmd string
+      return false unless out
       self.class.cmds[:all].each do |all_block|
         out = instance_exec out, &all_block
       end
@@ -58,7 +59,9 @@ module Oxidized
     def get
       data = ''
       self.class.cmds[:cmd].each do |command, block|
-        data << (cmd command, &block).to_s
+        out = cmd command, &block
+        return false unless out
+        data << out.to_s
       end
       data << main.to_s if respond_to? :main
       data