quark 0.0.1 → 0.0.2

data/bin/quark

@@ -7,7 +7,9 @@ module Quark
   class CLI
     class<<self
       def run()
-        @options = {}
+        Quark::Config.set("quark.address",   "127.0.0.1")
+        Quark::Config.set("quark.port",      12161)
+        Quark::Config.set("quark.blocksize", 3600000)
 
         (OptionParser.new do |opts|
           opts.banner = "Usage: quark [options]"
@@ -42,6 +44,11 @@ module Quark
             Quark::Config.set("quark.port", port)
           end
 
+        # -----------------------------------------------------------------------------
+          opts.on('-B', '--metric-block-size MSEC', 'The size of metric buckets (in milliseconds) that metrics should be split into') do |blocksize|
+            Quark::Config.set("quark.blocksize", blocksize)
+          end
+
         end).parse!
 
         Quark::Server.run()

data/lib/quark.rb

@@ -48,8 +48,8 @@ module Quark
 
   class Server
     def self.run()
-      @address  = Quark::Config.get("quark.address", "127.0.0.1")
-      @port     = Quark::Config.get("quark.port",    12161)
+      @address  = Quark::Config.get("quark.address")
+      @port     = Quark::Config.get("quark.port")
       @filename = Quark::Config.get("quark.socket")
 
       EM.run do

data/lib/quark/commands/fetch.rb

@@ -23,8 +23,8 @@ module Quark
         block = block.to_i
 
       # skip keys whose block falls outside of the given time range (if given)
-        next if block > 0 and not from.nil? and block < (from.to_i/1000/3600).to_i
-        next if block > 0 and not to.nil?   and block > (to.to_i/1000/3600).to_i
+        next if block > 0 and not from.nil? and block < (from.to_i/Quark::Config.get("quark.blocksize").to_i).to_i
+        next if block > 0 and not to.nil?   and block > (to.to_i/Quark::Config.get("quark.blocksize").to_i).to_i
 
       # get all values, sort by timestamp ascending, and append to ouput (within range, if given)
         @redis.hgetall(key).sort{|a,b|

data/lib/quark/commands/observe.rb

@@ -2,7 +2,14 @@ module Quark
   module SocketServer
     def process_command_observe(data)
       id, value, timestamp = data.chomp.split(' ')
-      block = Integer(timestamp.to_i / 1000 / 3600)
+      timestamp = timestamp.to_i
+
+    # automatically convert epoch seconds to milliseconds to provide Graphite metric compatibility
+      if timestamp < 2147483647
+        (timestamp = timestamp * 1000)
+      end
+
+      block = Integer(timestamp / Quark::Config.get("quark.blocksize").to_i)
 
       @redis.hset("#{@_prefix}:#{id}:#{block}", timestamp, value)
       return nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quark
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &14255880 !ruby/object:Gem::Requirement
+  requirement: &13898660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *14255880
+  version_requirements: *13898660
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &14253980 !ruby/object:Gem::Requirement
+  requirement: &13897140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *14253980
+  version_requirements: *13897140
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &14252900 !ruby/object:Gem::Requirement
+  requirement: &13896080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *14252900
+  version_requirements: *13896080
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &14251500 !ruby/object:Gem::Requirement
+  requirement: &13894740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *14251500
+  version_requirements: *13894740
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &14265760 !ruby/object:Gem::Requirement
+  requirement: &13893380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *14265760
+  version_requirements: *13893380
 description: A small service for logging and retrieving timeseries metrics into a
   Redis server
 email: garyhetzel@gmail.com