graphite-api 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14c8492d53a5c59cdc5aac29799bd8f68f65e6a3
-  data.tar.gz: f507be4c76cced41e1a341522d5e3f3887a9319a
+  metadata.gz: d3795d731081bacee9b35120d168a33510344cfb
+  data.tar.gz: 7ca9645cdc7ba74fd7d4cd0c9acca2339d08ff51
 SHA512:
-  metadata.gz: 2302eb52dbe69f2cb0af57a5388c60f5a744e38bba5ef4d127d7a0ce312bdbb869df4dea21338c0f12756c14224c12b695e63e64418e45271bd9555edb396ef2
-  data.tar.gz: 0f17e949e935de4ef4af47ad2a2f2061002cbe7a5965253b3166a4ea21dcb04d5292ffc63e47037434d3fc1a6bc90d550cee4f50862cf707bbf0a9120cad2787
+  metadata.gz: c406a9bd20f842267022b51ce627e30850f1ccf1fbc35b49ac7522a02a1e6b64c3f6ca7e514287c5ddd053985ef1d2f5aa89cc3c616b2378213d4c90b1c1212a
+  data.tar.gz: 34d55c38be10cefbaa253889d6294941116612857a404145ae17bb1ba447149f381d0eef336bc999b046afd3cd04da4f3201ad563d2968917ae91b2db4762658

data/README.md

@@ -111,19 +111,6 @@ client.increment("jobs_in_queue", "num_errors", by: 20, time: Time.at(123456))
 
 ```
 
-Some DSL sweetness
-```ruby
-require 'graphite-api'
-
-client = GraphiteAPI.new( graphite: 'graphite:2003' )
-
-client.webServer.web01.loadAvg 10.7 
-# => webServer.web01.loadAvg 10.7 time.now.to_i
-
-client.webServer.web01.blaBlaBla(29.1, Time.at(9999999999))
-# => webServer.web01.blaBlaBla 29.1 9999999999
-```
-
 Built-in timers support
 ```ruby
 require 'graphite-api'
@@ -168,8 +155,7 @@ end
 client.join # wait for ever...
 ```
 
-Logging support
-
+Logger
 ```ruby
 # Provide an external logger
 require 'graphite-api'
@@ -179,10 +165,7 @@ GraphiteAPI::Logger.logger = ::Logger.new(STDOUT)
 GraphiteAPI::Logger.logger.level = ::Logger::DEBUG
 
 # Or use the built-in one
-GraphiteAPI::Logger.init(
-  :level => :debug,
-  :std   => 'logger.out' # or STDOUT | STDERR
-)
+GraphiteAPI::Logger.init level: :debug, dev: 'logger.out' # or STDOUT | STDERR
 ```
 
 ## GraphiteAPI-Middleware Usage

data/lib/graphite-api/client.rb

@@ -11,7 +11,7 @@ module GraphiteAPI
       @buffer  = GraphiteAPI::Buffer.new options
       @connectors = GraphiteAPI::Connector::Group.new options
       
-      Zscheduler.every(options[:interval]){ send_metrics } unless options[:direct]
+      Zscheduler.every(options[:interval]) { send_metrics } unless options[:direct]
     end
 
     def_delegator Zscheduler, :loop, :join
@@ -52,30 +52,8 @@ module GraphiteAPI
       sleep while buffer.new_records?
     end
 
-    def method_missing m, *args, &block
-      Proxy.new( self ).send(m,*args,&block)
-    end
-
     protected
 
-    class Proxy
-      def initialize client
-        @client, @keys = client, []
-      end
-
-      def method_missing m, *args, &block
-        if @keys.push(m).size > 10 
-          super # too deep
-        elsif args.any?
-          @client.metrics Hash[
-            @keys.join('.'), args.first
-          ], *args[1..-1]
-        else
-          self
-        end
-      end
-    end
-
     def validate options
       options.tap do |opt|
         raise ArgumentError.new ":graphite must be specified" if opt[:graphite].nil?
@@ -93,6 +71,8 @@ module GraphiteAPI
 
     def send_metrics
       connectors.publish buffer.pull :string if buffer.new_records?
+    rescue Exception => e
+      Zscheduler.init_reactor? ? raise : Logger.error("Publish Error: #{e}\n#{e.backtrace.join("\n")}")
     end
 
   end

data/lib/graphite-api/connector.rb

@@ -32,7 +32,7 @@ module GraphiteAPI
       begin
         Logger.debug [:connector,:puts,[@host, @port].join(":"),message]
         socket.puts message + "\n"
-      rescue Errno::EPIPE, Errno::EINVAL, Errno::ETIMEDOUT
+      rescue Exception
         @socket = nil
         (counter += 1) <= 5 ? retry : raise
       end

data/lib/graphite-api/logger.rb

@@ -19,10 +19,10 @@ module GraphiteAPI
       attr_accessor :logger
       
       # :level => :debug
-      # :std => out|err|file-name
+      # :dev => out|err|file-name
       def init(options)
-        self.logger = ::Logger.new(options[:std] || STDOUT)
-        self.logger.level= ::Logger.const_get "#{options[:level].to_s.upcase}"
+        self.logger = ::Logger.new options.fetch(:dev, STDOUT)
+        self.logger.level= ::Logger.const_get options[:level].to_s.upcase
       end
       
       def method_missing(m,*args,&block)

data/lib/graphite-api/version.rb

@@ -1,3 +1,3 @@
 module GraphiteAPI
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphite-api
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Eran Barak Levi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.7
 description: Graphite API - A Simple ruby client, aggregator daemon and API tools
 email: eran@kontera.com
 executables: