munin-ruby 0.2.2 → 0.2.3

data/lib/munin-ruby/connection.rb

@@ -1,5 +1,3 @@
-require 'socket'
-
 module Munin
   class Connection
     include Munin::Parser
@@ -29,13 +27,19 @@ module Munin
     #
     def open
       begin
-        @socket = TCPSocket.new(@host, @port)
-        @socket.sync = true
-        welcome = @socket.gets
-        unless welcome =~ /^# munin node at/
-          raise Munin::AccessDenied
+        begin
+          with_timeout do
+            @socket = TCPSocket.new(@host, @port)
+            @socket.sync = true
+            welcome = @socket.gets
+            unless welcome =~ /^# munin node at/
+              raise Munin::AccessDenied
+            end
+            @connected = true
+          end
+        rescue Timeout::Error
+          raise Munin::ConnectionError, "Timed out talking to #{@host}"
         end
-        @connected = true
       rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET => ex
         raise Munin::ConnectionError, ex.message
       rescue EOFError
@@ -66,16 +70,23 @@ module Munin
           open
         end
       end
-      @socket.puts("#{str.strip}\n")
+
+      begin
+        with_timeout { @socket.puts("#{str.strip}\n") }
+      rescue Timeout::Error
+        raise Munin::ConnectionError, "Timed out on #{@host} trying to send."
+      end
     end
     
     # Reads a single line from socket
     #
     def read_line
       begin
-        @socket.gets.to_s.strip
+        with_timeout { @socket.gets.to_s.strip }
       rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError => ex
         raise Munin::ConnectionError, ex.message
+      rescue Timeout::Error
+        raise Munin::ConnectionError, "Timed out reading from #{@host}."
       end
     end
     
@@ -83,16 +94,33 @@ module Munin
     #
     def read_packet
       begin
-        lines = []
-        while(str = @socket.readline.to_s) do
-          break if str.strip == '.'
-          lines << str.strip
+        with_timeout do
+          lines = []
+          while(str = @socket.readline.to_s) do
+            break if str.strip == '.'
+            lines << str.strip
+          end
+          parse_error(lines)
+          lines
         end
-        parse_error(lines)
-        lines
       rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, EOFError => ex
         raise Munin::ConnectionError, ex.message
+      rescue Timeout::Error
+        raise Munin::ConnectionError, "Timed out reading from #{@host}."
+      end
+    end
+
+    private
+
+    # Execute operation with timeout
+    # @param [Block] block Block to execute
+    def with_timeout(time=Munin::TIMEOUT_TIME)
+      raise ArgumentError, "Block required" if !block_given?
+      if Munin::TIMEOUT_CLASS.respond_to?(:timeout_after)
+        Munin::TIMEOUT_CLASS.timeout_after(time) { yield }
+      else
+        Munin::TIMEOUT_CLASS.timeout(time) { yield }
       end
     end
   end
-end
+end

data/lib/munin-ruby/version.rb

@@ -1,5 +1,5 @@
 module Munin
   unless defined?(::Munin::VERSION)
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

data/lib/munin-ruby.rb

@@ -1,6 +1,25 @@
+require 'rubygems'
+require 'socket'
+
+begin
+  require 'system_timer'
+rescue LoadError
+  require 'timeout'
+end
+
 require 'munin-ruby/version'
 require 'munin-ruby/errors'
 require 'munin-ruby/parser'
 require 'munin-ruby/cache'
 require 'munin-ruby/connection'
-require 'munin-ruby/node'
+require 'munin-ruby/node'
+
+module Munin
+  TIMEOUT_TIME = 10
+
+  if defined?(SystemTimer)
+    TIMEOUT_CLASS = SystemTimer
+  else
+    TIMEOUT_CLASS = Timeout
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: munin-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000Z
+date: 2012-07-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165744280 !ruby/object:Gem::Requirement
+  requirement: &2152614540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2165744280
+  version_requirements: *2152614540
 description: Munin Node client
 email: dan.sosedoff@gmail.com
 executables: []