quark 0.1.0 → 0.1.2

data/bin/quark

@@ -19,7 +19,7 @@ module Quark
           end
 
         # -----------------------------------------------------------------------------
-          opts.on('', '--redis-port PORT', 'Hostname of the Redis server to write to') do |port|
+          opts.on('', '--redis-port PORT', 'Port of the Redis server to write to') do |port|
             Quark::Config.set("redis.port", port)
           end
 
@@ -34,22 +34,22 @@ module Quark
           end
 
         # -----------------------------------------------------------------------------
-          opts.on('-a', '--address ADDR', 'The IP address for the TCP server to listen on') do |addr|
+          opts.on('-a', '--address ADDR', 'The IP address for all servers to listen on') do |addr|
             Quark::Config.set("quark.address", addr)
           end
 
         # -----------------------------------------------------------------------------
-          opts.on('-p', '--port PORT', 'The TCP port to listen on') do |port|
+          opts.on('-p', '--port PORT', 'The TCP/UDP port to listen on') do |port|
             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|
+          opts.on('', '--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
 
         # -----------------------------------------------------------------------------
-          opts.on('-T', '--[no-]tcp', 'Create a TCP server') do |mode|
+          opts.on('-T', '--[no-]tcp', 'Enable/disable TCP server') do |mode|
             Quark::Config.set("quark.tcp.enabled", mode)
           end
 
@@ -64,7 +64,7 @@ module Quark
           end
 
         # -----------------------------------------------------------------------------
-          opts.on('-U', '--[no-]udp', 'Create a UDP server') do |mode|
+          opts.on('-U', '--[no-]udp', 'Enable/disable UDP server') do |mode|
             Quark::Config.set("quark.udp.enabled", mode)
           end
 
@@ -81,7 +81,7 @@ module Quark
           end
 
         # -----------------------------------------------------------------------------
-          opts.on('-H', '--[no-]http', 'Create an HTTP server') do |mode|
+          opts.on('-H', '--[no-]http', 'Enable/disable HTTP server') do |mode|
             Quark::Config.set("quark.http.enabled", mode)
           end
 
@@ -95,6 +95,11 @@ module Quark
             Quark::Config.set("quark.http.port", port)
           end
 
+        # -----------------------------------------------------------------------------
+          opts.on('', '--[no-]http-cors', 'Enable/disable Cross-Origin Resource Sharing on the HTTP server') do |mode|
+            Quark::Config.set("quark.http.cors", mode)
+          end
+
         # -----------------------------------------------------------------------------
           opts.on('-D', '--debug', 'Enable debug mode') do
             Quark::Config.set("debug", true)

data/lib/quark.rb

@@ -19,13 +19,7 @@ module Quark
     end
 
     def post_init()
-      @redis = Redis.new({
-        :host => Quark::Config.get("redis.host", "127.0.0.1"),
-        :port => Quark::Config.get("redis.port", 6379).to_i,
-        :db   => Quark::Config.get("redis.db", 0).to_i
-      })
-
-      @_prefix = Quark::Config.get("redis.prefix", "quark")
+      self.setup()
     end
 
     def receive_data(data)
@@ -36,6 +30,11 @@ module Quark
       send_data(MultiJson.dump(data)+"\n")
     end
 
+    def self.setup(redis, prefix='quark')
+      @redis   = redis
+      @_prefix = prefix
+    end
+
     def self.process_command(data)
     # if the data perfectly resembles a graphite-formatted metric (without a command prefix)
     # then assume the command is "observe"
@@ -103,6 +102,17 @@ module Quark
       Quark::Config.get("quark.http.cors",       false)
       Quark::Config.set("quark.graphite_compat", true)
       Quark::Config.set("debug",                 false)
+
+      @redis = Redis.new({
+        :host => Quark::Config.get("redis.host", "127.0.0.1"),
+        :port => Quark::Config.get("redis.port", 6379).to_i,
+        :db   => Quark::Config.get("redis.db", 0).to_i
+      })
+
+      @_prefix = Quark::Config.get("redis.prefix", "quark")
+
+      Quark::SocketServer.setup(@redis, @_prefix)
+      nil
     end
 
     def self.run()
@@ -157,6 +167,33 @@ module Quark
       end
     end
 
+  # removes metrics that match keys and (optionally) are older than 'to'
+  # if 'to' is negative, it is assumed to be n-seconds ago
+  #
+    def self.purge(keys, to=nil)
+      keys = [@_prefix, keys, '*'].join(':') if not keys.start_with?(@_prefix)
+      now = (Time.now.to_f * 1000).to_i
+      rv = []
+
+      @redis.keys(keys).each do |key|
+        x, name, block = key.split(':', 3)
+        block = block.to_i
+
+        if ((to = Integer(to)) rescue false)
+          if to < 0
+            to = now - (-1 * to * 1000)
+          end
+        end
+
+        if to.nil? or block < (to/Quark::Config.get("quark.blocksize")).to_i
+          @redis.del(key)
+          rv << key
+        end
+      end
+
+      rv
+    end
+
     def self.quit()
       puts "Stopping Quark..."
       EM.stop()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quark
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.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: &5731120 !ruby/object:Gem::Requirement
+  requirement: &22466740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *5731120
+  version_requirements: *22466740
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &5730020 !ruby/object:Gem::Requirement
+  requirement: &22464820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *5730020
+  version_requirements: *22464820
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &5728780 !ruby/object:Gem::Requirement
+  requirement: &22463240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *5728780
+  version_requirements: *22463240
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &5742700 !ruby/object:Gem::Requirement
+  requirement: &22483300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *5742700
+  version_requirements: *22483300
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &5739540 !ruby/object:Gem::Requirement
+  requirement: &22481860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *5739540
+  version_requirements: *22481860
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &5737440 !ruby/object:Gem::Requirement
+  requirement: &22507040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.35
   type: :runtime
   prerelease: false
-  version_requirements: *5737440
+  version_requirements: *22507040
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &5359100 !ruby/object:Gem::Requirement
+  requirement: &22505980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5359100
+  version_requirements: *22505980
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
-  requirement: &5356080 !ruby/object:Gem::Requirement
+  requirement: &22504900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5356080
+  version_requirements: *22504900
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &5352680 !ruby/object:Gem::Requirement
+  requirement: &22503560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5352680
+  version_requirements: *22503560
 description: A small service for logging and retrieving timeseries metrics into a
   Redis server
 email: garyhetzel@gmail.com