graphite-api 0.0.6 → 0.1.0

data/README.md

@@ -51,11 +51,12 @@ Creating a new client instance
 require 'graphite-api'
 
 GraphiteAPI::Client.new(
-  graphite: "graphite.example.com:2003", # not optional
-  prefix: ["example","prefix"], # add example.prefix to each key
-  slice: 60 # results are aggregated in 60 seconds slices
-  interval: 60 # send to graphite every 60 seconds
-  cache: 4 * 60 * 60 # set the max age in seconds for records reanimation
+  graphite: "graphite.example.com:2003", # required argument
+  prefix: ["example","prefix"],          # add example.prefix to each key
+  slice: 60,                             # results are aggregated in 60 seconds slices
+  interval: 60,                          # send to graphite every 60 seconds
+                                         # default is 0 ( direct send )
+  cache: 4 * 60 * 60                     # set the max age in seconds for records reanimation
 )
 ```
 
@@ -131,7 +132,7 @@ client = GraphiteAPI::Client.new( graphite: 'graphite:2003' )
 
 # lets send the metric every 120 seconds
 client.every(120) do |c|
-  c.webServer.web01.uptime `uptime`.split.first.to_i
+  c.metrics("webServer.web01.uptime" => `uptime`.split.first.to_i)
 end
 ```
 
@@ -143,11 +144,11 @@ require 'graphite-api/core_ext/numeric'
 client = GraphiteAPI::Client.new( graphite: 'graphite:2003' )
 
 client.every 10.seconds do |c|
-  c.webServer.web01.uptime `uptime`.split.first.to_i
+  c.metrics("webServer.web01.uptime" => `uptime`.split.first.to_i)
 end
 
 client.every 52.minutes do |c|
-  c.just.fake 12
+  c.metrics("just.fake" => 12)
 end
 ```
 
@@ -159,9 +160,9 @@ require 'graphite-api/core_ext/numeric'
 client = GraphiteAPI::Client.new( graphite: 'graphite:2003' )
 
 client.every 26.minutes do |c|
-  c.webServer.shuki.stats 10
-  c.webServer.shuki.x 97
-  c.webServer.shuki.y 121
+  c.metrics("webServer.shuki.stats" => 10)
+  c.metrics("webServer.shuki.x" => 97)
+  c.metrics("webServer.shuki.y" => 121)
 end
 
 client.join # wait for ever...

data/lib/graphite-api.rb

@@ -1,22 +1,23 @@
+require 'zscheduler'
+
 module GraphiteAPI
   ROOT = File.expand_path(File.dirname(__FILE__))
+  require "#{ROOT}/graphite-api/version"
 
-  autoload :Version,         "#{ROOT}/graphite-api/version"
-  autoload :Client,          "#{ROOT}/graphite-api/client"
-  autoload :Cache,           "#{ROOT}/graphite-api/cache"
-  autoload :SafeBuffer,      "#{ROOT}/graphite-api/safe_buffer"
-  autoload :Reactor,         "#{ROOT}/graphite-api/reactor"
-  autoload :Connector,       "#{ROOT}/graphite-api/connector"
-  autoload :Middleware,      "#{ROOT}/graphite-api/middleware"
-  autoload :Runner,          "#{ROOT}/graphite-api/runner"
-  autoload :Utils,           "#{ROOT}/graphite-api/utils"
-  autoload :CLI,             "#{ROOT}/graphite-api/cli"
-  autoload :Buffer,          "#{ROOT}/graphite-api/buffer"
-  autoload :Logger,          "#{ROOT}/graphite-api/logger"
-  autoload :ConnectorGroup,  "#{ROOT}/graphite-api/connector_group"
+  autoload :Version,    "#{ROOT}/graphite-api/version"
+  autoload :Client,     "#{ROOT}/graphite-api/client"
+  autoload :Cache,      "#{ROOT}/graphite-api/cache"
+  autoload :Reactor,    "#{ROOT}/graphite-api/reactor"
+  autoload :Connector,  "#{ROOT}/graphite-api/connector"
+  autoload :Middleware, "#{ROOT}/graphite-api/middleware"
+  autoload :Runner,     "#{ROOT}/graphite-api/runner"
+  autoload :Utils,      "#{ROOT}/graphite-api/utils"
+  autoload :CLI,        "#{ROOT}/graphite-api/cli"
+  autoload :Buffer,     "#{ROOT}/graphite-api/buffer"
+  autoload :Logger,     "#{ROOT}/graphite-api/logger"
 
   def self.version
-    GraphiteAPI::Version::VERSION
+    GraphiteAPI::VERSION
   end
   
 end

data/lib/graphite-api/{safe_buffer.rb → buffer.rb}

@@ -3,7 +3,7 @@
 # Handle Socket & Client data streams
 # -----------------------------------------------------
 # Usage:
-#     buff = GraphiteAPI::SafeBuffer.new(GraphiteAPI::Utils.default_options)
+#     buff = GraphiteAPI::Buffer.new(GraphiteAPI::Utils.default_options)
 #     buff << {:metric => {"load_avg" => 10},:time => Time.now}
 #     buff << {:metric => {"load_avg" => 30},:time => Time.now}
 #     buff.stream "mem.usage 1"
@@ -20,7 +20,7 @@ require 'thread'
 require 'set'
 
 module GraphiteAPI
-  class SafeBuffer
+  class Buffer
     include Utils
     
     CHARS_TO_BE_IGNORED = ["\r"]
@@ -90,7 +90,7 @@ module GraphiteAPI
     end
     
     def inspect
-      "#<GraphiteAPI::SafeBuffer:%s @quque#size=%s @streamer=%s>" % 
+      "#<GraphiteAPI::Buffer:%s @quque#size=%s @streamer=%s>" % 
         [object_id,queue.size,streamer]
     end
     
@@ -122,4 +122,4 @@ module GraphiteAPI
     end
         
   end
-end
+end

data/lib/graphite-api/cache/memory.rb

@@ -4,7 +4,7 @@ module GraphiteAPI
       include Utils
       
       def initialize options
-        Reactor.every(120) { clean(options[:cache]) }
+        Zscheduler.every(120) { clean(options[:cache]) }
       end
       
       def get time, key
@@ -33,4 +33,4 @@ module GraphiteAPI
       
     end
   end
-end
+end

data/lib/graphite-api/client.rb

@@ -44,32 +44,36 @@ module GraphiteAPI
   class Client
     include Utils
 
+    private_reader :options, :buffer, :connectors, :direct_send
+
     def initialize opt
       @options = build_options validate opt.clone
-      @buffer  = GraphiteAPI::SafeBuffer.new options
-      @connectors = GraphiteAPI::ConnectorGroup.new options
-      
-      every options.fetch :interval do
-        connectors.publish buffer.pull :string if buffer.new_records?
+      @buffer  = GraphiteAPI::Buffer.new options
+      @connectors = GraphiteAPI::Connector::Group.new options
+      @direct_send = @options[:interval] == 0
+
+      if direct_send
+        options[:slice] = 1
+      else
+        every(options.fetch(:interval),&method(:send_metrics))
       end
-      
+
     end
 
-    private_reader :options, :buffer, :connectors
+    def_delegator Zscheduler, :loop, :join
+    def_delegator Zscheduler, :stop
 
-    def_delegator :"GraphiteAPI::Reactor", :loop
-    def_delegator :"GraphiteAPI::Reactor", :stop
-    
     def every interval, &block
-      Reactor.every( interval ) { block.call self }
+      Zscheduler.every( interval ) { block.arity == 1 ? block.call(self) : block.call }
     end
-    
+
     def metrics metric, time = Time.now 
       buffer.push :metric => metric, :time => time
+      send_metrics if direct_send
     end
-    
+
     alias_method :add_metrics, :metrics
-    
+
     # increment keys
     #
     # increment("key1","key2")
@@ -88,27 +92,27 @@ module GraphiteAPI
       metric = keys.inject({}) {|h,k| h.tap { h[k] = by}}
       metrics(metric, time)
     end
-    
+
     def join
       sleep while buffer.new_records?
     end
-    
+
     def method_missing m, *args, &block
-      Proxy.new( self ).send m, *args, &block
+      Proxy.new( self ).send(m,*args,&block)
     end
-    
+
     protected
-    
+
     class Proxy
       include Utils
-      
+
       def initialize client
         @client = client
         @keys = []
       end
-      
+
       private_reader :client, :keys
-      
+
       def method_missing m, *args, &block
         keys.push m
         if keys.size > 10 # too deep
@@ -119,22 +123,25 @@ module GraphiteAPI
           self
         end
       end
-      
+
     end
-            
+
     def validate options
       options.tap do |opt|
         raise ArgumentError.new ":graphite must be specified" if opt[:graphite].nil?
       end
     end
-    
+
     def build_options opt
       default_options.tap do |options_hash|
         options_hash[:backends].push expand_host opt.delete :graphite
         options_hash.merge! opt
-        options_hash.freeze
       end
     end
-    
+
+    def send_metrics
+      connectors.publish buffer.pull :string if buffer.new_records?
+    end
+
   end
 end

data/lib/graphite-api/connector.rb

@@ -12,6 +12,23 @@ require 'socket'
 
 module GraphiteAPI
   class Connector
+    class Group
+      include Utils
+
+      private_reader :options, :connectors
+
+      def initialize options
+        @options = options
+        @connectors = options[:backends].map { |o| Connector.new(*o) }
+      end
+
+      def publish messages
+        debug [:connector_group,:publish,messages.size, @connectors]
+        Array(messages).each { |msg| connectors.map {|c| c.puts msg} }
+      end
+
+    end
+
     include Utils
     
     def initialize host, port

data/lib/graphite-api/core_ext/numeric.rb

@@ -1,20 +1 @@
-class Numeric
-  {
-    :year   => 365 * 24 * 3600,
-    :month  => 30 * 24 * 3600,
-    :week   => 7 * 24 * 3600,
-    :day    => 24 * 3600,
-    :hour   => 3600,
-    :minute => 60,
-    :second => 1
-  }.each do |m,val|
-      respond_to? m or define_method m do 
-        self * val
-      end
-      
-      "#{m}s".tap do |plural|
-        respond_to? plural or alias_method plural, m
-      end
-
-    end    
-end
+require 'zscheduler/core_ext/numeric'

data/lib/graphite-api/middleware.rb

@@ -57,8 +57,8 @@ module GraphiteAPI
       EventMachine.run do
         GraphiteAPI::Logger.info "Server running on port #{options[:port]}"
         
-        buffer = GraphiteAPI::SafeBuffer.new options
-        group  = GraphiteAPI::ConnectorGroup.new options
+        buffer = GraphiteAPI::Buffer.new options
+        group  = GraphiteAPI::Connector::Group.new options
         
         # Starting server
         [:start_server, :open_datagram_socket].each do |m|
@@ -66,12 +66,12 @@ module GraphiteAPI
         end
 
         # Send metrics to graphite every X seconds
-        proc { group.publish buffer.pull :string if buffer.new_records? }.tap do |block|
-          GraphiteAPI::Reactor.every options[:interval], &block
-          GraphiteAPI::Reactor.add_shutdown_hook &block
+        Zscheduler.every(options[:interval],:on_shutdown => true) do
+          group.publish buffer.pull :string if buffer.new_records?
         end
+
       end  
     end
     
   end # Middleware
-end # GraphiteAPI
+end # GraphiteAPI

data/lib/graphite-api/runner.rb

@@ -36,12 +36,12 @@ module GraphiteAPI
         Middleware.start options
       rescue Interrupt
         Logger.info "Shutting down..."
-        Reactor.stop
+        Zscheduler.shutdown
       end
     end
 
     def options
-      @options ||= Utils.default_options
+      @options ||= Utils.default_middleware_options
     end
 
     def validate_options

data/lib/graphite-api/utils.rb

@@ -56,11 +56,15 @@ module GraphiteAPI
         :cache => nil,
         :host => "localhost",
         :prefix => [],
-        :interval => 60,
+        :interval => 0,
         :slice => 60,
         :pid => "/tmp/graphite-middleware.pid"
       }
     end
 
+    def default_middleware_options
+      default_options.merge(:interval => 60)
+    end
+
   end
-end
+end

data/lib/graphite-api/version.rb

@@ -1,5 +1,3 @@
 module GraphiteAPI
-  class Version
-    VERSION = "0.0.6"
-  end
+  VERSION = "0.1.0"
 end

data/tasks/build.rake

@@ -17,6 +17,7 @@ GraphiteAPI::GemSpec = Gem::Specification.new do |s|
   s.bindir                = "bin"
 
   s.add_dependency 'eventmachine','>= 0.3.3'
+  s.add_dependency 'zscheduler',  '>= 0.0.3'
 end
 
 task :gem => [:test,:clobber_package]
@@ -28,4 +29,4 @@ end
 task :install => [:gem] do
    sh "gem install pkg/graphite-api"
    Rake::Task['clobber_package'].execute
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphite-api
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.3
+- !ruby/object:Gem::Dependency
+  name: zscheduler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: Graphite API - A Simple ruby client, aggregator daemon and API tools
 email: eran@kontera.com
 executables:
@@ -37,18 +53,16 @@ files:
 - README.md
 - Rakefile
 - bin/graphite-middleware
+- lib/graphite-api/buffer.rb
 - lib/graphite-api/cache/memory.rb
 - lib/graphite-api/cache.rb
 - lib/graphite-api/cli.rb
 - lib/graphite-api/client.rb
 - lib/graphite-api/connector.rb
-- lib/graphite-api/connector_group.rb
 - lib/graphite-api/core_ext/numeric.rb
 - lib/graphite-api/logger.rb
 - lib/graphite-api/middleware.rb
-- lib/graphite-api/reactor.rb
 - lib/graphite-api/runner.rb
-- lib/graphite-api/safe_buffer.rb
 - lib/graphite-api/utils.rb
 - lib/graphite-api/version.rb
 - lib/graphite-api.rb

data/lib/graphite-api/connector_group.rb

@@ -1,18 +0,0 @@
-module GraphiteAPI
-  class ConnectorGroup
-    include Utils
-    
-    private_reader :options, :connectors
-
-    def initialize options
-      @options = options
-      @connectors = options[:backends].map { |o| Connector.new(*o) }
-    end
-
-    def publish messages
-      debug [:connector_group,:publish,messages.size, @connectors]
-      Array(messages).each { |msg| connectors.map {|c| c.puts msg} }
-    end
-    
-  end
-end

data/lib/graphite-api/reactor.rb

@@ -1,59 +0,0 @@
-require 'eventmachine'
-
-module GraphiteAPI
-  class Reactor
-    @@wrapper = nil
-    
-    class << self
-      def every(frequency,&block)
-        reactor_running? or start_reactor
-        timers << EventMachine::PeriodicTimer.new(frequency.to_i) { yield }
-        timers.last
-      end
-
-      def stop
-        timers.each(&:cancel)
-        shutdown_hooks.each(&:call)
-        wrapper and EventMachine.stop
-      end
-
-      def join
-        wrapper and wrapper.join
-      end
-      
-      def add_shutdown_hook(&block)
-        shutdown_hooks << block
-      end
-      
-      def loop
-        EventMachine.reactor_thread.join
-      end
-      
-      private
-      
-      def start_reactor
-        @@wrapper = Thread.new { EventMachine.run }
-        wrapper.abort_on_exception = true
-        Thread.pass until reactor_running?
-      end
-
-      def reactor_running?
-        EventMachine.reactor_running?
-      end
-      
-      def wrapper 
-        @@wrapper
-      end
-      
-      def timers
-        @@timers ||= []
-      end
-      
-      def shutdown_hooks 
-        @@shutdown_hooks ||= []
-      end
-      
-    end
-    
-  end
-end