riemann-client 0.2.3 → 0.2.4

data/lib/riemann/client.rb

@@ -70,18 +70,17 @@ class Riemann::Client
       (response.states || [])
   end
 
+  def connect
+    # NOTE: connections are made automatically on send
+    warn "Riemann client#connect is deprecated"
+  end
+
   # Close both UDP and TCP sockets.
   def close
     @udp.close
     @tcp.close
   end
 
-  # Connect both UDP and TCP sockets.
-  def connect
-    udp.connect
-    tcp.connect
-  end
-
   def connected?
     tcp.connected? and udp.connected?
   end

data/lib/riemann/client/tcp.rb

@@ -28,9 +28,7 @@ module Riemann
             close
           end
 
-          if @socket and not @socket.closed?
-            return @socket
-          end
+          return @socket if connected?
 
           @socket = self.class.socket_factory.call(@options)
           @pid    = Process.pid
@@ -41,15 +39,15 @@ module Riemann
 
       def close
         @locket.synchronize do
-          if @socket && !@socket.closed?
-            @socket.close
-          end
+          @socket.close if connected?
           @socket = nil
         end
       end
 
       def connected?
-        !@socket && @socket.closed?
+        @locket.synchronize do
+          !@socket.nil? && !@socket.closed?
+        end
       end
 
       # Read a message from a stream
@@ -63,12 +61,12 @@ module Riemann
             puts "Message was #{str.inspect}"
             raise
           end
-          
+
           unless message.ok
             puts "Failed"
             raise ServerError, message.error
           end
-          
+
           message
         else
           raise InvalidResponse, "unexpected EOF"
@@ -87,7 +85,7 @@ module Riemann
       # Yields a connection in the block.
       def with_connection
         tries = 0
-        
+
         @locket.synchronize do
           begin
             tries += 1

data/lib/riemann/client/udp.rb

@@ -3,27 +3,26 @@ module Riemann
     class UDP < Client
       MAX_SIZE = 16384
 
-      attr_accessor :host, :port, :socket, :max_size
+      attr_accessor :host, :port, :max_size
 
       def initialize(opts = {})
-        @host = opts[:host] || HOST
-        @port = opts[:port] || PORT
+        @host     = opts[:host] || HOST
+        @port     = opts[:port] || PORT
         @max_size = opts[:max_size] || MAX_SIZE
-        @locket = Mutex.new
       end
 
-      def connect
+      def socket
+        return @socket if connected?
         @socket = UDPSocket.new
       end
 
       def close
-        @locket.synchronize do
-          @socket.close
-        end
+        @socket.close if connected?
+        @socket = nil
       end
 
       def connected?
-        !!@socket && @socket.closed?
+        @socket && !@socket.closed?
       end
 
       # Read a message from a stream
@@ -36,42 +35,10 @@ module Riemann
       end
 
       def send_maybe_recv(message)
-        with_connection do |s|
-          x = message.encode ''
-          unless x.length < @max_size
-            raise TooBig
-          end
-
-          s.send(x, 0, @host, @port)
-          nil
-        end
-      end
-
-      # Yields a connection in the block.
-      def with_connection
-        tries = 0
-        
-        @locket.synchronize do
-          begin
-            tries += 1
-              yield(@socket || connect)
-          rescue IOError => e
-            raise if tries > 3
-            connect and retry
-          rescue Errno::EPIPE => e
-            raise if tries > 3
-            connect and retry
-          rescue Errno::ECONNREFUSED => e
-            raise if tries > 3
-            connect and retry
-          rescue Errno::ECONNRESET => e
-            raise if tries > 3
-            connect and retry
-          rescue InvalidResponse => e
-            raise if tries > 3
-            connect and retry
-          end
-        end
+        encoded_string = message.encode.to_s
+        raise TooBig unless encoded_string.length < @max_size
+        socket.send(encoded_string, 0, @host, @port)
+        nil
       end
     end
   end

data/lib/riemann/message.rb

@@ -1,7 +1,7 @@
 module Riemann
   class Message
     include Beefcake::Message
-    
+
     optional :ok, :bool, 2
     optional :error, :string, 3
     repeated :states, State, 4
@@ -9,9 +9,8 @@ module Riemann
     repeated :events, Event, 6
 
     def encode_with_length
-      buffer = ''
-      encoded = encode buffer
-      "#{[encoded.length].pack('N')}#{encoded}"
+      encoded_string = encode.to_s
+      [encoded_string.length].pack('N') << encoded_string
     end
-  end 
+  end
 end

data/lib/riemann/version.rb

@@ -1,3 +1,3 @@
 module Riemann
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,55 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: riemann-client
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
+  prerelease: 
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: mtrc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.4
 description: 
@@ -75,25 +82,26 @@ files:
 - README.markdown
 homepage: https://github.com/aphyr/riemann-ruby-client
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: riemann-client
-rubygems_version: 2.0.14
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Client for the distributed event system Riemann.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 971fad804164c0db71b3e689d9b866ad89a20e41
-  data.tar.gz: 1e7f35daae4ab58fa8018225959da905bfd5f77b
-SHA512:
-  metadata.gz: 904df6b31de7feda767274d2a776040287d2b3849280257abd5b167171adf990812b5deabfdde8a48a220b329564476c93a844bb195a11655736578784c84a3c
-  data.tar.gz: 3ccaa03c50e24502eee6e9e440279a1d5989b776f70ad04536654e3c887c3f14fb841502593fb84d3dbd9256749a7babb6870d4a7f4f9eb1c259f23f39b5e14f