graphiterb 0.2.7 → 0.2.9

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.9

data/graphiterb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{graphiterb}
-  s.version = "0.2.7"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philip (flip) Kromer (@mrflip)"]
-  s.date = %q{2010-09-10}
+  s.date = %q{2010-09-20}
   s.description = %q{Uses http://github.com/mrflip/configliere and http://graphite.wikidot.com}
   s.email = %q{info@infochimps.org}
   s.extra_rdoc_files = [

data/lib/graphiterb/accumulator.rb

@@ -20,10 +20,14 @@ module Graphiterb
     # The Redis database.
     attr_accessor :redis
 
-    # The Redis namespace used for the accumulators.
+    # The name of the Redis namespace (a string) in which
+    # accumulations are stored (defaults to 'graphiterb')
+    attr_accessor :namespace
+
+    # The Redis namespace (an object) used for the accumulators.
     attr_accessor :accumulators
 
-    # The top-level scope under which to accumulate.
+    # The top-level Graphite scope inserted for each record.
     attr_accessor :main_scope
 
     # Provides methods for finding out about the node this code is
@@ -34,14 +38,24 @@ module Graphiterb
     #
     # Takes the same options as Redis.new.
     #
+    # Also takes the :namespace option to change where the
+    # accumulations are stored.  Different applications can use
+    # different accumulators with different namespaces in a single,
+    # shared Redis.
+    #
     # @param [String] main_scope
     # @param [Hash] options
     def initialize main_scope, options={}
       require 'redis'
-      require 'redis-namespace'
+      begin
+        require 'redis-namespace'
+      rescue LoadError
+        require 'redis/namespace'
+      end
       @main_scope   = main_scope
       @redis        = Redis.new(options)
-      @accumulators = Redis::Namespace.new('graphiterb_accumulators', :redis => redis)
+      @namespace    = options[:namespace] || 'graphiterb'
+      @accumulators = Redis::Namespace.new(namespace, :redis => redis)
     end
 
     # Increment the Graphite target +args+ by the given +amount+.

data/lib/graphiterb/monitors.rb

@@ -54,7 +54,7 @@ module Graphiterb
         self.current_iter  = 0
         self.options       = options
         self.time_interval = options[:time]  || 30 
-        self.iter_interval = options[:iters] || 30 
+        self.iter_interval = options[:iters] || 30
       end
 
       # The Graphiterb::Sender used to communicate with the Graphite
@@ -137,7 +137,7 @@ module Graphiterb
       # last ran and insert metrics into the array.")
       #
       # @param [Array<String>] metrics
-      # @param [Time] since the last time the monitor ran
+      # @param [Float] since the number of seconds since the last time the monitor ran
       def get_metrics metrics, since
         raise Graphiterb::NotImplementedError.new("Override the get_metrics method of the #{self.class} class")
       end

data/lib/graphiterb/monitors/accumulations_consumer.rb

@@ -8,6 +8,10 @@ module Graphiterb
       # The Redis database.
       attr_accessor :redis
 
+      # The name of the Redis namespace (a string) in which
+      # accumulations are stored (defaults to 'graphiterb')
+      attr_accessor :namespace
+
       # The Redis namespace used for the accumulators.
       attr_accessor :accumulators
 
@@ -20,6 +24,10 @@ module Graphiterb
       # Options are passed to Redis.new as well as
       # Graphiterb::Monitors::PeriodicMonitor.
       #
+      # Include the :namespace option to tell this consumer which
+      # Redis namespace to consume keys from (defaults to
+      # 'graphiterb').
+      #
       # Include the :regexp option if you want this monitor to only
       # consume keys corresponding to Graphite targets which match the
       # regexp.  This is useful for having multiple
@@ -27,11 +35,16 @@ module Graphiterb
       # frequencies tracking different Graphite target families.
       def initialize options={}
         require 'redis'
-        require 'redis-namespace'
+        begin
+          require 'redis-namespace'
+        rescue LoadError
+          require 'redis/namespace'
+        end
         @redis        = Redis.new(options)
-        @accumulators = Redis::Namespace.new('graphiterb_accumulators', :redis => @redis)
+        @namespace    = options[:namespace] || 'graphiterb'
+        @accumulators = Redis::Namespace.new(namespace, :redis => @redis)
         @regexp       = options[:regexp] || /.*/
-        super('fake_scope', options)
+        super('fake_scope', options) # FIXME shouldn't have to use a fake scope
       end
 
       # Uses Redis' +getset+ call to retrieve total accumulated counts

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graphiterb
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Philip (flip) Kromer (@mrflip)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 -05:00
+date: 2010-09-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency