graphite-api 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 971a57f1632c01fa383fcafd604fb0c020e55039
-  data.tar.gz: b49356560ef58767756cb38c5110685307ec5113
+  metadata.gz: 4ca6b15c3e2131c39c0ebee88a04cda7dd4995dc
+  data.tar.gz: c7e5f47fc0fcf7f16e345847178288133188df6b
 SHA512:
-  metadata.gz: 0a31a71042953ac8b4cee6c23f29b934f6202b2e0f609a6b80b99d20b122683461f2a6e2bdb8ae25fb8fb07ebe5d6239499390c8beee2f329003656e8cdbc29d
-  data.tar.gz: 4e4d60ccf3f79cf80af1efad3018731f99e252c02ec0e281e6ec6414ee53c7e9b4fe66a8e19ad5f906a33ca7d9b25ec897d0c5299afd794ff5115a8ea97f92ac
+  metadata.gz: e15fe6ed1788991886a59eef139c100d6cc36c161384241a90b049715cf55d95aa315afdf493c9bb48ceeaa518f491174d0ae76c0cce1915e61634b6b54c1d22
+  data.tar.gz: b8d341c9549391e8e8a1af4a045444a0c84f6e82dd47fa161c892e2b636431ff059c49f21c2cb0b3a3d8fb31790d45683567561b10867929575397603777d114

data/README.md

@@ -49,22 +49,22 @@ require 'graphite-api'
 
 options = {
   # Required: valid URI {udp,tcp}://host:port/?timeout=seconds
-  graphite: "udp://graphite.example.com:2003", 
-  
+  graphite: "udp://graphite.example.com:2003",
+
   # Optional: add example.prefix to each key
   prefix: ["example","prefix"],
-  
+
   # Optional: results are aggregated in 60 seconds slices ( default is 60 )
   slice: 60,
-  
+
   # Optional: send to graphite every 60 seconds ( default is 0 - direct send )
   interval: 60,
-  
+
   # Optional: set the max age in seconds for records reanimation ( default is 12 hours )
   cache: 4 * 60 * 60
 }
 
-client = GraphiteAPI.new options 
+client = GraphiteAPI.new options
 ```
 
 TCP Client
@@ -108,6 +108,28 @@ client.metrics({
 # => webServer.web01.memUsage 40 1326067060
 ```
 
+Verifying connectivity
+```ruby
+require 'graphite-api'
+
+client = GraphiteAPI.new graphite: 'udp://UNKNOWN-HOST:1234'
+client.check!
+
+SocketError: udp://UNKNOWN-HOST:1234: getaddrinfo: nodename nor servname provided, or not known
+	from graphite-api/lib/graphite-api/connector.rb:71:in `connect'
+	from graphite-api/lib/graphite-api/connector.rb:71:in `block in init_udp'
+	from graphite-api/lib/graphite-api/connector.rb:71:in `tap'
+	from graphite-api/lib/graphite-api/connector.rb:71:in `init_udp'
+	from graphite-api/lib/graphite-api/connector.rb:37:in `socket'
+	from graphite-api/lib/graphite-api/connector.rb:30:in `check!'
+	from graphite-api/lib/graphite-api/connector.rb:88:in `block in check!'
+	from graphite-api/lib/graphite-api/connector.rb:86:in `each'
+	from github/graphite-api/lib/graphite-api/connector.rb:86:in `check!'
+	from graphite-api/lib/graphite-api/client.rb:22:in `check!'
+	from (irb):4
+	from ~/.rvm/rubies/ruby-2.3.3/bin/irb:11:in `<main>'
+```
+
 Increment records
 ```ruby
 require 'graphite-api'
@@ -217,7 +239,7 @@ More Info @ https://github.com/kontera-technologies/graphite-api
   --log-file /tmp/graphite-middleware.out                         \
   --daemonize                                                     \
   --graphite graphite-server:2003                                 \
-  --graphite graphite-backup-server:2003   
+  --graphite graphite-backup-server:2003
 ```
 
 * Send metrics via **UDP/TCP sockets**
@@ -238,7 +260,7 @@ example.middleware.value2 99 1334929231
 ```ruby
 require 'graphite-api'
 client = GraphiteAPI.new(:graphite => 'tcp://graphite-middleware-node:2005')
-client.example.middleware.value 10.2 
+client.example.middleware.value 10.2
 client.example.middleware.value2 27
 client.bla.bla.value2 27
 ```

data/lib/graphite-api/client.rb

@@ -1,5 +1,5 @@
 require 'forwardable'
-    
+
 module GraphiteAPI
   class Client
     extend Forwardable
@@ -13,15 +13,20 @@ module GraphiteAPI
       @options = build_options validate opt.clone
       @buffer  = GraphiteAPI::Buffer.new options
       @connectors = GraphiteAPI::Connector::Group.new options
-      
+
       Zscheduler.every(options[:interval]) { send_metrics } unless options[:direct]
     end
 
+    # throw exception on Socket error
+    def check!
+      connectors.check!
+    end
+
     def every interval, &block
       Zscheduler.every( interval ) { block.arity == 1 ? block.call(self) : block.call }
     end
 
-    def metrics metric, time = Time.now 
+    def metrics metric, time = Time.now
       return if metric.empty?
       buffer.push :metric => metric, :time => time
       send_metrics if options[:direct]

data/lib/graphite-api/connector.rb

@@ -1,77 +1,75 @@
-# -----------------------------------------------------
-# TCP Socket connection
-# -----------------------------------------------------
-# Usage:
-#    connector = GraphiteAPI::Connector.new("localhost",2003)
-#    connector.puts("my.metric 1092 1232123231")
-#
-# Socket:
-# => my.metric 1092 1232123231\n
-# -----------------------------------------------------
 require 'socket'
 require 'uri'
 
 module GraphiteAPI
   class Connector
+    attr_reader :uri
 
-    class UDPSocket
-      def initialize uri
-        @uri = uri
-        @socket = ::UDPSocket.new
-      end
+    def initialize uri
+      @uri = URI.parse uri
+      @uri = @uri.host ? @uri : URI.parse("udp://#{uri}")
+    end
 
-      def puts message
-        @socket.send message, 0, @uri.host, @uri.port
+    def puts message
+      counter = 0
+      begin
+        Logger.debug [:connector, :puts, @uri.to_s, message]
+        socket.puts message + "\n"
+      rescue Exception
+        @socket = nil
+        (counter += 1) <= 5 ? retry : raise
       end
+    end
 
-      def closed?
-        @socket.closed? rescue true
-      end
+    def inspect
+      "#<#{self.class}:#{object_id}: #{@uri}>"
     end
 
-    class TCPSocket
-      def initialize uri
-        @uri = uri
-      end
+    # Manually init Socket, exception will be thrown on error
+    def check!
+      socket; nil
+    end
 
-      def puts message
-        socket.puts message
-      end
+    private
 
-      def closed?
-        socket.closed? rescue true
+    def socket
+      if @socket.nil? || @socket.closed?
+        @socket = @uri.scheme.eql?("tcp") ? init_tcp : init_udp
       end
 
-      def socket
-        @socket ||= begin
-          host, port = @uri.host, @uri.port
-          timeout = Hash[URI.decode_www_form(@uri.query.to_s)].fetch("timeout", 1).to_f
-          addr = Socket.getaddrinfo host, nil, :INET
-          sockaddr = Socket.pack_sockaddr_in port, addr[0][3]
+      @socket
+    end
 
-          sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
-          sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
+    def init_tcp
+      host, port = @uri.host, @uri.port
+      timeout = Hash[URI.decode_www_form(@uri.query.to_s)].fetch("timeout", 1).to_f
+      addr = Socket.getaddrinfo host, nil, :INET
+      sockaddr = Socket.pack_sockaddr_in port, addr[0][3]
+
+      sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
+      sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
+      begin
+        sock.connect_nonblock sockaddr
+      rescue IO::WaitWritable
+        if IO.select nil, [sock], nil, timeout
           begin
             sock.connect_nonblock sockaddr
-          rescue IO::WaitWritable
-            if IO.select nil, [sock], nil, timeout
-              begin
-                sock.connect_nonblock sockaddr
-              rescue Errno::EISCONN # success
-              rescue
-                sock.close
-                raise
-              end
-            else
-              sock.close
-              raise "Connection timeout"
-            end
+          rescue Errno::EISCONN # success
+          rescue
+            sock.close
+            raise
           end
-          sock
-        end #begin
+        else
+          sock.close
+          raise "Connection timeout"
+        end
+      end
+      sock
+    end
 
-      end # Socket
-    end # TCPSocket
+    def init_udp
+      UDPSocket.new.tap {|x| x.connect @uri.host, @uri.port }
+    end
 
     class Group
       def initialize options
@@ -82,37 +80,18 @@ module GraphiteAPI
         Logger.debug [:connector_group, :publish, messages.size, @connectors]
         Array(messages).each { |msg| @connectors.map {|c| c.puts msg} }
       end
-    end
-
-    ##############################################################################
-
-    def initialize uri
-      @uri = URI.parse uri
-      @uri = @uri.host ? @uri : URI.parse("udp://#{uri}")
-    end
-
-    def puts message
-      counter = 0
-      begin
-        Logger.debug [:connector, :puts, @uri.to_s, message]
-        socket.puts message + "\n"
-      rescue Exception
-        @socket = nil
-        (counter += 1) <= 5 ? retry : raise
-      end
-    end
-
-    def inspect
-      "#<#{self.class}:#{object_id}: #{@uri}>"
-    end
-
-    private 
 
-    def socket
-      if @socket.nil? || @socket.closed?
-        @socket = @uri.scheme.eql?("tcp") ? TCPSocket.new(@uri) : UDPSocket.new(@uri)
+      # init all sockets in group.
+      # should throw exception on Socket errors.
+      def check!
+        @connectors.each do |c|
+          begin
+            c.check!
+          rescue Exception => e
+            raise e, "#{c.uri}: #{e.message}", e.backtrace
+          end
+        end
       end
-      @socket
     end
 
   end

data/lib/graphite-api/version.rb

@@ -1,3 +1,3 @@
 module GraphiteAPI
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphite-api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Eran Barak Levi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-01 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine