quark 0.1.2 → 0.1.3

data/bin/quark

@@ -20,7 +20,7 @@ module Quark
 
         # -----------------------------------------------------------------------------
           opts.on('', '--redis-port PORT', 'Port of the Redis server to write to') do |port|
-            Quark::Config.set("redis.port", port)
+            Quark::Config.set("redis.port", port.to_i)
           end
 
         # -----------------------------------------------------------------------------
@@ -40,12 +40,12 @@ module Quark
 
         # -----------------------------------------------------------------------------
           opts.on('-p', '--port PORT', 'The TCP/UDP port to listen on') do |port|
-            Quark::Config.set("quark.port", port)
+            Quark::Config.set("quark.port", port.to_i)
           end
 
         # -----------------------------------------------------------------------------
           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)
+            Quark::Config.set("quark.blocksize", blocksize.to_i)
           end
 
         # -----------------------------------------------------------------------------
@@ -60,7 +60,7 @@ module Quark
 
         # -----------------------------------------------------------------------------
           opts.on('', '--tcp-port PORT', 'The TCP port to listen on') do |port|
-            Quark::Config.set("quark.tcp.port", port)
+            Quark::Config.set("quark.tcp.port", port.to_i)
           end
 
         # -----------------------------------------------------------------------------
@@ -77,7 +77,7 @@ module Quark
         # -----------------------------------------------------------------------------
           opts.on('', '--udp-port PORT', 'The port start the UDP server on') do |port|
             Quark::Config.set("quark.udp.enabled", true)
-            Quark::Config.set("quark.udp.port", port)
+            Quark::Config.set("quark.udp.port", port.to_i)
           end
 
         # -----------------------------------------------------------------------------
@@ -92,7 +92,7 @@ module Quark
 
         # -----------------------------------------------------------------------------
           opts.on('', '--http-port PORT', 'The HTTP port to listen on') do |port|
-            Quark::Config.set("quark.http.port", port)
+            Quark::Config.set("quark.http.port", port.to_i)
           end
 
         # -----------------------------------------------------------------------------
@@ -110,9 +110,19 @@ module Quark
             Quark::Config.set("quark.graphite_compat", mode)
           end
 
+        # -----------------------------------------------------------------------------
+          opts.on('-e', '--exec', 'Execute the given query and output the results') do
+            Quark::Config.set("execute", true)
+          end
+
         end).parse!
 
-        Quark::Server.run()
+        if Quark::Config.get("execute") === true
+          rv = Quark::SocketServer.process_command(ARGV.join(' '))
+          puts MultiJson.dump(rv, :pretty => true)
+        else
+          Quark::Server.run()
+        end
       end
     end
   end

data/lib/quark/servers/http.rb

@@ -10,6 +10,7 @@ module Quark
           mime_type :json, 'application/json'
 
           if Quark::Config.get("quark.http.cors") === true
+            puts "HTTP Cross-Origin Resource Sharing is ON"
             set :allow_origin, :any
             set :allow_methods, [:get, :post, :options]
             set :allow_credentials, true
@@ -19,6 +20,7 @@ module Quark
 
         before do
           if Quark::Config.get("quark.http.cors") === true
+            headers 'Access-Control-Allow-Origin'  => '*'
             headers 'Access-Control-Allow-Headers' => 'origin, x-requested-with, accept'
           end
 
@@ -36,6 +38,14 @@ module Quark
           MultiJson.dump(Quark::SocketServer.process_command("#{params[:command].upcase} #{params[:splat].first.gsub('/',' ')}".strip))
         end
 
+        get '/observe/:metric/:value/?' do
+          MultiJson.dump(Quark::SocketServer.process_command_observe("#{params[:metric]} #{params[:value]} #{(Time.now.to_f * 1000).to_i}"))
+        end
+
+        get '/observe/:metric/:value/:timestamp/?' do
+          MultiJson.dump(Quark::SocketServer.process_command_observe("#{params[:metric]} #{params[:value]} #{params[:timestamp]}"))
+        end
+
         def _quark_command(command, payload)
           io = nil
 

data/lib/quark.rb

@@ -5,8 +5,6 @@ require 'hiredis'
 require 'em-synchrony'
 require 'multi_json'
 require 'quark/config'
-require 'quark/servers/http'
-
 
 module Quark
   class Error < Exception; end
@@ -145,8 +143,11 @@ module Quark
 
       # TCP server
         if Quark::Config.get("quark.tcp.enabled") === true
-          puts "Starting TCP server on #{@address}:#{@port}..."
-          EM::start_server(@address, @port, Quark::SocketServer)
+          @tcp_address = Quark::Config.get("quark.tcp.address", @address)
+          @tcp_port    = Quark::Config.get("quark.tcp.port",    @port)
+
+          puts "Starting TCP server on #{@tcp_address}:#{@tcp_port}..."
+          EM::start_server(@tcp_address, @tcp_port, Quark::SocketServer)
         end
 
       # HTTP server
@@ -155,6 +156,8 @@ module Quark
           @http_port    = Quark::Config.get("quark.http.port",    12180)
 
           puts "Starting HTTP server on #{@http_address}:#{@http_port}..."
+          require 'quark/servers/http'
+
           Quark::Server::HttpServer.new({
             :address => @http_address,
             :port    => @http_port

metadata

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