riemann-client 0.2.1 → 0.2.2

data/README.markdown

@@ -9,8 +9,8 @@ Use
 ``` ruby
 require 'riemann/client'
 
-# Create a client. Host and port are optional.
-c = Riemann::Client.new host: 'localhost', port: 5555
+# Create a client. Host, port and timeout are optional.
+c = Riemann::Client.new host: 'localhost', port: 5555, timeout: 5
 
 # Send a simple event
 c << {service: 'testing', metric: 2.5}

data/lib/riemann.rb

@@ -3,6 +3,7 @@ module Riemann
 
   require 'rubygems'
   require 'beefcake'
+  require 'timeout'
   require 'riemann/version'
   require 'riemann/state'
   require 'riemann/attribute'

data/lib/riemann/client.rb

@@ -13,15 +13,17 @@ class Riemann::Client
 
   HOST = '127.0.0.1'
   PORT = 5555
+  TIMEOUT = 5
 
   require 'riemann/client/tcp'
   require 'riemann/client/udp'
 
-  attr_accessor :host, :port, :tcp, :udp
+  attr_accessor :host, :port, :tcp, :udp, :timeout
 
   def initialize(opts = {})
     @host = opts[:host] || HOST
     @port = opts[:port] || PORT
+    @timeout = opts[:timeout] || TIMEOUT
     @udp = UDP.new opts
     @tcp = TCP.new opts
   end

data/lib/riemann/client/tcp.rb

@@ -6,11 +6,14 @@ module Riemann
       def initialize(opts = {})
         @host = opts[:host] || HOST
         @port = opts[:port] || PORT
+        @timeout = opts[:timeout] || TIMEOUT
         @locket = Mutex.new
       end
 
       def connect
-        @socket = TCPSocket.new(@host, @port)
+        Timeout::timeout(@timeout) do
+          @socket = TCPSocket.new(@host, @port)
+        end
       end
 
       def close
@@ -20,7 +23,7 @@ module Riemann
       end
 
       def connected?
-        not @socket.closed?
+        !@socket && @socket.closed?
       end
 
       # Read a message from a stream
@@ -78,6 +81,9 @@ module Riemann
           rescue InvalidResponse => e
             raise if tries > 3
             connect and retry
+          rescue Timeout::Error => e
+            raise if tries > 3
+            connect and retry
           end
         end
       end

data/lib/riemann/client/udp.rb

@@ -23,7 +23,7 @@ module Riemann
       end
 
       def connected?
-        not @socket.closed?
+        !!@socket && @socket.closed?
       end
 
       # Read a message from a stream

data/lib/riemann/version.rb

@@ -1,3 +1,3 @@
 module Riemann
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake