nexia_worker_roulette 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd0eeadb6b1a835e8b4e048efd15e646cd00640a
-  data.tar.gz: 8485398a8d5d7ef3f7fea43615ace7a685a38958
+  metadata.gz: 485a631bf7929866af1715af3649ce0ef5abcd49
+  data.tar.gz: 562bdf170332fe368447e8c2dac02ec9a6fbabd8
 SHA512:
-  metadata.gz: 764df03a358b164235df1c13ae983c1633aaadf45e485bb9e1d859ea2f13df46f691aee85dadd94c878c429d614140c1d44b077f10cd9f20d11a6f6af4ec0c05
-  data.tar.gz: bb213af4edb64d491bf89b8df8e4bf337dcffc7371d697b7dcb12ad3eb77bfe7be9923675ee2edfe442df5629c5a61f4046bf2c156d58af7fc6a29bb125d0f37
+  metadata.gz: 24ad87c7f75d708465ae59e0844f9157feb850bf8c631da32deb47f3f6d480ae80c7a2848a539acf3d25263602ec9c6126418fb31f58a55eedd11f225f2e4a27
+  data.tar.gz: d40ea3cdb9da663ae62d5413a7445b14daf5170f4c42353f77609c569c9351fb4b7e6442074e83a8c64240ef830c4c906f817b2e1bb22186d6713dd13daf0f2a

data/lib/worker_roulette/queue_latency_tracker.rb

@@ -3,7 +3,8 @@ module QueueLatencyTracker
 
   class Foreman
     def process(work_order, _channel)
-      work_order['headers'].merge!("queued_at" => (Time.now.to_f * GRANULARITY).to_i)
+      work_order['headers'].merge!(
+        "queued_at" => (Time.now.to_f * GRANULARITY).to_i) if work_order.is_a?(Hash) && work_order["headers"]
       work_order
     end
   end

data/lib/worker_roulette/version.rb

@@ -1,3 +1,3 @@
 module WorkerRoulette
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/worker_roulette.rb

@@ -76,7 +76,7 @@ module WorkerRoulette
       QueueLatencyTracker.configure(
         {
           server_name: `hostname`.chomp,
-          logstash_server_ip: Resolv::DNS.new.getaddress(config[:logstash_server_name]).to_s,
+          logstash_server_ip: ip_address(config[:logstash_server_name]),
           logstash_port: config[:logstash_port]
         }
       )
@@ -112,6 +112,10 @@ module WorkerRoulette
 
     private
 
+    def ip_address(server_name)
+      server_name == "localhost" ? "127.0.0.1" : Resolv::DNS.new.getaddress(server_name).to_s
+    end
+
     def new_redis
       if @evented
         require 'eventmachine'

data/spec/integration/evented_worker_roulette_spec.rb

@@ -12,7 +12,13 @@ module WorkerRoulette
     let(:foreman_work_order)                { Hash["payload" => "foreman"] }
     let(:work_orders_with_headers)          { default_headers.merge({ "payload" => work_orders }) }
     let(:jsonized_work_orders_with_headers) { [WorkerRoulette.dump(work_orders_with_headers)] }
-    let(:worker_roulette)                   { WorkerRoulette.start(evented: true) }
+    let(:latency_tracker)                   {
+        {
+          logstash_server_name: "localhost",
+          logstash_port: 7777
+        }
+    }
+    let(:worker_roulette)                   { WorkerRoulette.start(evented: true, latency_tracker: latency_tracker) }
     let(:redis)                             { Redis.new(worker_roulette.redis_config) }
 
     before do
@@ -59,7 +65,9 @@ module WorkerRoulette
         extra_headers = {"foo" => "bars"}
         foreman.enqueue_work_order(work_orders, extra_headers) do
           work_orders_with_headers["headers"].merge!(extra_headers)
-          expect(redis.lrange(sender, 0, -1)).to eq([WorkerRoulette.dump(work_orders_with_headers)])
+          redis_work_orders = redis.lrange(sender, 0, -1)
+          work_orders = redis_work_orders.map {|wo| Oj.load(wo.to_s) }
+          expect(work_orders).to eq([work_orders_with_headers])
           done
         end
       end

data/spec/integration/worker_roulette_spec.rb

@@ -1,4 +1,5 @@
 require "spec_helper"
+
 module WorkerRoulette
   class Tradesman
     attr_reader :lua
@@ -6,14 +7,15 @@ module WorkerRoulette
 
   describe WorkerRoulette do
     let(:sender)                            { 'katie_80' }
+    let(:queued_at)       { 1234567 }
     let(:work_orders)                       { ["hello", "foreman"] }
-    let(:queued_at)                         { 1234567 }
-    let(:default_headers)                   { Hash["headers" => { "sender" => sender, "queued_at" => (queued_at.to_f * 1_000_000).to_i }] }
+    let(:default_headers)                   { Hash["headers" => { "sender" => sender }] }
     let(:hello_work_order)                  { Hash['payload' => "hello"] }
     let(:foreman_work_order)                { Hash['payload' => "foreman"] }
     let(:work_orders_with_headers)          { default_headers.merge({ 'payload' => work_orders }) }
     let(:jsonized_work_orders_with_headers) { [WorkerRoulette.dump(work_orders_with_headers)] }
-    let(:worker_roulette)                   { WorkerRoulette.start }
+    let(:worker_roulette)                   { WorkerRoulette.start(evented: false, latency_tracker: latency_tracker) }
+    let(:latency_tracker)                   { nil }
 
     let(:redis) { Redis.new(worker_roulette.redis_config) }
 
@@ -56,13 +58,17 @@ module WorkerRoulette
         extra_headers = { 'foo' => 'bars' }
         foreman.enqueue_work_order(work_orders, extra_headers)
         work_orders_with_headers['headers'].merge!(extra_headers)
-        expect(redis.lrange(sender, 0, -1)).to eq([WorkerRoulette.dump(work_orders_with_headers)])
+        redis_work_orders = redis.lrange(sender, 0, -1)
+        work_orders = redis_work_orders.map {|wo| Oj.load(wo.to_s) }
+        expect(work_orders).to eq([work_orders_with_headers])
       end
 
       it "posts the sender's id to the job board with an order number" do
         foreman.enqueue_work_order(work_orders.first)
         worker_roulette.foreman('other_forman').enqueue_work_order(work_orders.last)
-        expect(redis.zrange(foreman.job_board_key, 0, -1, with_scores: true)).to eq([[sender, 1.0], ["other_forman", 2.0]])
+        redis_work_orders = redis.zrange(foreman.job_board_key, 0, -1, with_scores: true)
+        work_orders = redis_work_orders.map {|wo| Oj.load(wo.to_s) }
+        expect(work_orders).to eq([[sender, 1.0], ["other_forman", 2.0]])
       end
 
       it "generates a monotically increasing score for senders not on the job board, but not for senders already there" do
@@ -144,10 +150,21 @@ module WorkerRoulette
         end
       end
 
-      it "sees queued_at in the header" do
-        tradesman.wait_for_work_orders do |redis_work_orders|
-          expect(redis_work_orders.first["headers"]["queued_at"]).to_not be_nil
-          allow(tradesman).to receive(:wait_for_work_orders)
+      context "when latency tracker is enabled" do
+        let(:default_headers) { Hash["headers" => { "sender" => sender, "queued_at" => (queued_at.to_f * 1_000_000).to_i }] }
+        let(:queued_at)       { 1234567 }
+        let(:latency_tracker) {
+          {
+            logstash_server_name: "localhost",
+            logstash_port: 7777
+          }
+        }
+
+        it "sees queued_at in the header" do
+          tradesman.wait_for_work_orders do |redis_work_orders|
+            expect(redis_work_orders.first["headers"]["queued_at"]).to_not be_nil
+            allow(tradesman).to receive(:wait_for_work_orders)
+          end
         end
       end
 

data/spec/unit/readlock_spec.rb

@@ -1,8 +1,14 @@
 require "spec_helper"
 
 module WorkerRoulette
- describe "Read Lock" do
-    let(:worker_roulette)          { WorkerRoulette.start(evented: false) }
+  describe "Read Lock" do
+    let(:latency_tracker)          {
+        {
+          logstash_server_name: "localhost",
+          logstash_port: 7777
+        }
+    }
+    let(:worker_roulette)          { WorkerRoulette.start(evented: false, latency_tracker: latency_tracker) }
     let(:redis)                    { Redis.new(worker_roulette.redis_config) }
     let(:sender)                   { "katie_80" }
     let(:work_orders)              { "hello" }

data/worker_roulette.gemspec

@@ -6,7 +6,7 @@ require 'worker_roulette/version'
 Gem::Specification.new do |spec|
   spec.name          = 'nexia_worker_roulette'
   spec.version       = WorkerRoulette::VERSION
-  spec.authors       = ['Paul Saieg']
+  spec.authors       = ['Paul Saieg', 'James Barnard', 'Eric Schwartz']
   spec.email         = ['classicist@gmail.com']
   spec.description   = %q{Pub Sub Queue for Redis that ensures ordered processing}
   spec.summary       = %q{Pub Sub Queue for Redis that ensures ordered processing}

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: nexia_worker_roulette
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Paul Saieg
+- James Barnard
+- Eric Schwartz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -246,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Pub Sub Queue for Redis that ensures ordered processing