quark 0.0.6 → 0.0.7

data/bin/quark

@@ -7,10 +7,12 @@ module Quark
   class CLI
     class<<self
       def run()
-        Quark::Config.set("quark.address",     "127.0.0.1")
-        Quark::Config.set("quark.port",        12161)
-        Quark::Config.set("quark.blocksize",   3600000)
-        Quark::Config.set("quark.udp.enabled", false)
+        Quark::Config.set("quark.address",         "127.0.0.1")
+        Quark::Config.set("quark.port",            12161)
+        Quark::Config.set("quark.blocksize",       3600000)
+        Quark::Config.set("quark.udp.enabled",     false)
+        Quark::Config.set("quark.graphite_compat", true)
+        Quark::Config.set("debug",                 false)
 
         (OptionParser.new do |opts|
           opts.banner = "Usage: quark [options]"
@@ -36,12 +38,12 @@ module Quark
           end
 
         # -----------------------------------------------------------------------------
-          opts.on('-a', '--listen-address ADDR', 'The IP address to listen on') do |addr|
+          opts.on('-a', '--tcp-address ADDR', 'The IP address for the TCP server to listen on') do |addr|
             Quark::Config.set("quark.address", addr)
           end
 
         # -----------------------------------------------------------------------------
-          opts.on('-p', '--listen-port PORT', 'The TCP port to listen on') do |port|
+          opts.on('-p', '--tcp-port PORT', 'The TCP port to listen on') do |port|
             Quark::Config.set("quark.port", port)
           end
 
@@ -55,6 +57,11 @@ module Quark
             Quark::Config.set("quark.udp.enabled", true)
           end
 
+        # -----------------------------------------------------------------------------
+          opts.on('-D', '--debug', 'Enable debug mode') do
+            Quark::Config.set("debug", true)
+          end
+
         # -----------------------------------------------------------------------------
           opts.on('', '--udp-address ADDR', 'The IP address to start the UDP server on') do |addr|
             Quark::Config.set("quark.udp.enabled", true)
@@ -67,6 +74,12 @@ module Quark
             Quark::Config.set("quark.udp.port", port)
           end
 
+
+        # -----------------------------------------------------------------------------
+          opts.on('', '--[no-]graphite', 'Enable/disable Graphite socket compatibility mode') do |mode|
+            Quark::Config.set("quark.graphite_compat", mode)
+          end
+
         end).parse!
 
         Quark::Server.run()

data/lib/quark.rb

@@ -30,7 +30,7 @@ module Quark
     def receive_data(data)
     # if the data perfectly resembles a graphite-formatted metric (without a command prefix)
     # then assume the command is "observe"
-      if data =~ /^[\w\.\-]+ -?[\d\.]+ \d{10,13}$/
+      if Quark::Config.get("quark.graphite_compat") and data =~ /^[\w\.\-]+ -?[\d\.]+ \d{10,13}$/
         command   = "OBSERVE"
         arguments = data.chomp
       else
@@ -93,6 +93,10 @@ module Quark
       @filename = Quark::Config.get("quark.socket")
 
       EM.run do
+        if Quark::Config.get("debug")
+          puts "Debug mode is ON"
+        end
+
         if not @filename.nil? and File.writable?(File.dirname(@filename))
           puts "Starting socket server at #{@filename}..."
           EM::start_server(@filename, Quark::SocketServer)
@@ -110,6 +114,10 @@ module Quark
           puts "Starting TCP server on #{@address}:#{@port}..."
           EM::start_server(@address, @port, Quark::SocketServer)
         end
+
+        if Quark::Config.get("quark.graphite_compat")
+          puts "Graphite compatibility mode enabled: all sockets will accept Graphite-formatted metrics as observations"
+        end
       end
     end
   end

data/lib/quark/commands/observe.rb

@@ -11,6 +11,10 @@ module Quark
 
       block = Integer(timestamp / Quark::Config.get("quark.blocksize").to_i)
 
+      if Quark::Config.get("debug")
+        puts "OBSERVE #{@_prefix}:#{id}:#{block} #{value} #{timestamp}"
+      end
+
       @redis.hset("#{@_prefix}:#{id}:#{block}", timestamp, value)
       return ({
         :metric => id,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quark
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   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: &16109420 !ruby/object:Gem::Requirement
+  requirement: &15249980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *16109420
+  version_requirements: *15249980
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &16123800 !ruby/object:Gem::Requirement
+  requirement: &15249020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *16123800
+  version_requirements: *15249020
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &16122940 !ruby/object:Gem::Requirement
+  requirement: &15248140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *16122940
+  version_requirements: *15248140
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &16121300 !ruby/object:Gem::Requirement
+  requirement: &15263700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *16121300
+  version_requirements: *15263700
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &16133300 !ruby/object:Gem::Requirement
+  requirement: &15262720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *16133300
+  version_requirements: *15262720
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &16131280 !ruby/object:Gem::Requirement
+  requirement: &15261440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.0.35
   type: :runtime
   prerelease: false
-  version_requirements: *16131280
+  version_requirements: *15261440
 description: A small service for logging and retrieving timeseries metrics into a
   Redis server
 email: garyhetzel@gmail.com