profit 0.1.1 → 0.1.2

data/README.md

@@ -14,9 +14,10 @@ client.stop("some_suspect_code")
 ```
 
 Here's the server
-``` ruby
-server = Profit::Server.new
-server.run
+``` shell
+$ profit_server --redis-address 127.0.0.1:6379 \
+                --zmq-address tcp://*:5556 \
+                --pool-size 10
 ```
 
 And if you looked in Redis

data/bin/profit_server

@@ -1,5 +1,27 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
 require 'profit'
 
-Profit::Server.new.run
+options = {}
+OptionParser.new { |opts|
+  opts.banner = "Usage: profit_server [options]"
+
+  opts.on("-r", "--redis-address [STRING]", String,
+          "Redis Address (127.0.0.1:6379)") do |ra|
+    options[:redis_address] = ra.split(":").first
+    options[:redis_port]    = ra.split(":").last.to_i
+  end
+
+  opts.on("-z", "--zmq-address [STRING]", String,
+          "ZMQ Address (tcp://*:5556)") do |za|
+    options[:zmq_address] = za
+  end
+
+  opts.on("-n", "--pool-size [DECIMAL]", OptionParser::DecimalInteger,
+          "Redis client pool size (10)") do |n|
+    options[:pool_size] = n
+  end
+}.parse!
+
+Profit::Server.new(options).run

data/lib/profit.rb

@@ -1,11 +1,10 @@
 require 'zmq'
 require 'eventmachine'
-require 'redis'
+require 'em-hiredis'
 require 'json'
 
 module Profit
 end
 
-require 'profit/message_handler'
 require 'profit/server'
 require 'profit/client'

data/lib/profit/server.rb

@@ -4,64 +4,68 @@ module Profit
 
     attr_reader :ctx
 
-    def initialize
+    def initialize(options = {})
+      @options = {}
+      @options[:redis_address] = options[:redis_address] || "127.0.0.1"
+      @options[:redis_port]    = options[:redis_port]    || 6379
+      @options[:zmq_address]   = options[:zmq_address]   || "tcp://*:5556"
+      @options[:pool_size]     = options[:pool_size]     || 10
       @ctx = ZMQ::Context.new
     end
 
-    def shutdown!
-      @shutdown = true
-    end
-
-    def setup_trap_int
-      trap :INT do
-        puts "\nSIGINT received, quitting!"
-        EM.stop
-      end
-    end
-
     def run
-      @run = true
       EM.run do
 
-        @redis_pool = EM::Pool.new
-        spawn = lambda { @redis_pool.add Redis.new(host: "127.0.0.1", port: 6379) }
-        @redis_pool.on_error { |conn| spawn[] }
-        10.times { spawn[] }
-
-        @puller = @ctx.bind(:PULL, "tcp://127.0.0.1:5556")
+        # startup the EM::Hiredis connections
+        spawn_redis_connections
 
         # gives us a graceful exit
-        setup_trap_int
-
-        if @shutdown
-          EM.next_tick do # change to add_timer(1) for more delay
-            @run = false
-          end
-        end
+        setup_interrupt_handling
 
-        # allows us to break out of the loop
+        # this is the entry to message handling
         EM.add_periodic_timer do
-          unless @run
-            EM.stop unless @run
-          end
-        end
 
-        # ensures we can continue to run other specs
-        EM.add_shutdown_hook { puts("destroy"); @ctx.destroy }
+          # blocking ZMQ socket
+          message = puller.recv || ""
 
-        # this is the entry to message handling
-        EM.add_periodic_timer do
-          @redis_pool.perform do |conn|
-            message_handler = MessageHandler.new @puller.recv, conn
-
-            message_handler.callback do |response|
-              puts response.inspect
-            end
-            message_handler.run
-            message_handler
+          # take a worker from the pool to save the metric to Redis
+          redis_pool.perform do |conn|
+
+            message_hash = JSON.parse(message)
+            metric_type  = message_hash.delete("metric_type")
+
+            response     = conn.rpush "profit:metric:#{metric_type}", message_hash.to_json
+            response.callback { |resp| puts "callback: #{resp}"}
+            response.errback  { |resp| puts "errback: #{resp}"}
+            response
           end
         end
       end
     end
+
+    private
+
+    def setup_interrupt_handling
+      trap(:INT) { EM.stop }
+      EM.add_shutdown_hook { ctx.destroy }
+    end
+
+    def spawn_redis_connections
+      spawn = lambda { redis_pool.add(EM::Hiredis.connect(redis_address)) }
+      redis_pool.on_error { |conn| spawn[] }
+      @options[:pool_size].times { spawn[] }
+    end
+
+    def puller
+      @puller ||= ctx.bind(:PULL, @options[:zmq_address])
+    end
+
+    def redis_pool
+      @redis_pool ||= EM::Pool.new
+    end
+
+    def redis_address
+      "redis://#{@options[:redis_address]}:#{@options[:redis_port]}/"
+    end
   end
 end

data/lib/profit/version.rb

@@ -1,3 +1,3 @@
 module Profit
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/lib/client_spec.rb

@@ -8,11 +8,11 @@ describe Profit::Client do
   let!(:server_thread) { TestServer.server_thread }
 
   after do
-    redis.del("some_foo_measurement")
+    redis.del("profit:metric:some_foo_measurement")
   end
 
   it "sends the amount of time it takes to run some code" do
-    metrics = redis.lrange("some_foo_measurement", 0, -1)
+    metrics = redis.lrange("profit:metric:some_foo_measurement", 0, -1)
     expect(metrics).to be_empty
 
     client.start("some_foo_measurement")
@@ -21,7 +21,7 @@ describe Profit::Client do
 
     server_thread.join(0.1)
 
-    metrics = redis.lrange("some_foo_measurement", 0, -1)
+    metrics = redis.lrange("profit:metric:some_foo_measurement", 0, -1)
     metric = JSON.parse(metrics.first)
     expect(metric['recorded_time']).to be_within(0.1).of(1)
   end
@@ -80,8 +80,8 @@ describe Profit::Client do
   describe "#stop" do
 
     after do
-      redis.del("m_1")
-      redis.del("m_2")
+      redis.del("profit:metric:m_1")
+      redis.del("profit:metric:m_2")
     end
 
     it "matches up with the start marker" do
@@ -101,8 +101,8 @@ describe Profit::Client do
 
       server_thread.join(0.1)
 
-      first_measurement_list = redis.lrange("m_1", 0, -1)
-      second_measurement_list = redis.lrange("m_2", 0, -1)
+      first_measurement_list = redis.lrange("profit:metric:m_1", 0, -1)
+      second_measurement_list = redis.lrange("profit:metric:m_2", 0, -1)
 
       expect(first_measurement_list.count).to eq 2
       expect(second_measurement_list.count).to eq 1
@@ -121,7 +121,7 @@ describe Profit::Client do
 
       server_thread.join(0.1)
 
-      measurements = redis.lrange("m_1", 0, -1)
+      measurements = redis.lrange("profit:metric:m_1", 0, -1)
       metric = JSON.parse(measurements[0])
       expect(metric['stop_file']).to eq stop_file
       expect(metric['stop_line']).to eq stop_line

data/spec/lib/server_spec.rb

@@ -7,7 +7,7 @@ describe Profit::Server do
   let!(:server_thread) { TestServer.server_thread }
 
   after do
-    redis.del("some_slow_piece_of_code")
+    redis.del("profit:metric:some_slow_piece_of_code")
   end
 
   it "stores metrics messages" do
@@ -22,9 +22,9 @@ describe Profit::Server do
                   end_file: "/foo/bar/biz.rb" }.to_json)
     server_thread.join(0.1)
 
-    list = redis.lrange("some_slow_piece_of_code", 0, -1)
+    list = redis.lrange("profit:metric:some_slow_piece_of_code", 0, -1)
     expect(list.count).to eq 1
-    expect(redis.llen("some_slow_piece_of_code")).to eq 1
+    expect(redis.llen("profit:metric:some_slow_piece_of_code")).to eq 1
 
     metric = JSON.parse(list[0])
     expect(metric["total_time"]).to eq 12.012

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require './lib/profit'
+require 'redis'
 
 class TestServer
 
@@ -18,7 +19,6 @@ RSpec.configure do |config|
   end
 
   config.after(:suite) do
-    TestServer.server.shutdown!
     TestServer.server_thread.join(1)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: profit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: em-hiredis
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +133,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/profit/client.rb
-- lib/profit/message_handler.rb
 - lib/profit/server.rb
 - lib/profit/version.rb
 - lib/profit.rb
@@ -140,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1338827002242441259
+      hash: -1836147071158890398
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1338827002242441259
+      hash: -1836147071158890398
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/profit/message_handler.rb

@@ -1,26 +0,0 @@
-
-module Profit
-
-  class MessageHandler
-
-    include EM::Deferrable
-
-    attr_reader :text
-
-    def initialize(json, conn)
-      @json, @conn = json, conn
-    end
-
-    def run
-      return succeed("Starting") if @json.empty?
-      message_hash = JSON.parse(@json)
-      key = message_hash.delete("metric_type")
-      response = @conn.rpush key, message_hash.to_json
-      if response == "OK"
-        succeed response
-      else
-        fail response
-      end
-    end
-  end
-end