quark 0.0.3 → 0.0.4

data/bin/quark

@@ -10,6 +10,7 @@ module Quark
         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",       false)
 
         (OptionParser.new do |opts|
           opts.banner = "Usage: quark [options]"
@@ -49,6 +50,11 @@ module Quark
             Quark::Config.set("quark.blocksize", blocksize)
           end
 
+        # -----------------------------------------------------------------------------
+          opts.on('-U', '--udp', 'Create a UDP server instead of a TCP server') do
+            Quark::Config.set("quark.udp", true)
+          end
+
         end).parse!
 
         Quark::Server.run()

data/lib/quark.rb

@@ -28,7 +28,14 @@ module Quark
     end
 
     def receive_data(data)
-      command, arguments = data.chomp.split(' ',2)
+    # 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}$/
+        command   = "OBSERVE"
+        arguments = data.chomp
+      else
+        command, arguments = data.chomp.split(' ',2)
+      end
 
       begin
         if methods.include?(:"process_command_#{command.downcase}")
@@ -47,6 +54,7 @@ module Quark
         else
           raise Quark::InvalidCommand.new("Unknown command '#{command.upcase}'")
         end
+
       rescue Quark::Error => e
         send_json({
           :success => false,
@@ -89,8 +97,13 @@ module Quark
           puts "Starting server at #{@filename}..."
           EM::start_server(@filename, Quark::SocketServer)
         else
-          puts "Starting server on #{@address}:#{@port}..."
-          EM::start_server(@address, @port, Quark::SocketServer)
+          if Quark::Config.get("quark.udp") === true
+            puts "Starting UDP server on #{@address}:#{@port}..."
+            EM::open_datagram_socket(@address, @port, Quark::SocketServer)
+          else
+            puts "Starting TCP server on #{@address}:#{@port}..."
+            EM::start_server(@address, @port, Quark::SocketServer)
+          end
         end
       end
     end

data/lib/quark/commands/observe.rb

@@ -12,7 +12,10 @@ module Quark
       block = Integer(timestamp / Quark::Config.get("quark.blocksize").to_i)
 
       @redis.hset("#{@_prefix}:#{id}:#{block}", timestamp, value)
-      return nil
+      return ({
+        :metric => id,
+        :block  => block
+      })
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quark
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   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: &9517780 !ruby/object:Gem::Requirement
+  requirement: &13210860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *9517780
+  version_requirements: *13210860
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &9507840 !ruby/object:Gem::Requirement
+  requirement: &13223240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9507840
+  version_requirements: *13223240
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &9506400 !ruby/object:Gem::Requirement
+  requirement: &13232620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9506400
+  version_requirements: *13232620
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &9504900 !ruby/object:Gem::Requirement
+  requirement: &13228620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *9504900
+  version_requirements: *13228620
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &9502740 !ruby/object:Gem::Requirement
+  requirement: &13243440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,18 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *9502740
+  version_requirements: *13243440
+- !ruby/object:Gem::Dependency
+  name: hashlib
+  requirement: &13241340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.35
+  type: :runtime
+  prerelease: false
+  version_requirements: *13241340
 description: A small service for logging and retrieving timeseries metrics into a
   Redis server
 email: garyhetzel@gmail.com