fairway 0.3.4 → 0.3.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTYxMDc5ZDNmZWM4YmViYmExMzZlZTEyYTJhMmQ5ZTZkYzA5MGM2OQ==
+    OTY4Y2NjNWRkYTM0NzYwY2U3NWRmNzhmMWE3ZmVhY2M3MTlhMjc0Mg==
   data.tar.gz: !binary |-
-    ZjZhOTMyYTI0OTgzOTU3OTlmMTFhZDkyNzU4Y2U0NjVmOGQ4Yjc4NQ==
+    NzJjNmNjMTNmMGUxN2MyNjNlZWQ2MGE4MTY3OTg5NWMxZjU2NzZkYg==
 SHA512:
   metadata.gz: !binary |-
-    YmNlOTE3ODUzNmVmYWIwM2QwODUzN2NlMzM1NjAxMGQxMDk2ODY2NWE2Nzg5
-    ZjUyNTcwNzI5NmQxNjgxNzI5MDhjMDVhZDUxNDE3ODFiODZhZGFmZmRkNzYw
-    Njg0YjU3MjI5MDIxZTg4M2I4ZGE5ZGU5MmMwNWU0MGQyMmM4YzU=
+    ZWZmNmY3YmI5NDkyZGZmMDBhNWZkZDEyOGY3MWYxNmMzMWE3YTM3ZDRmNjdk
+    NGZmMzMwZjk3NDdmNGI5YTIzYjI2YzkyN2M0Nzc0YjA2Yzc4MDYxZTllZWE2
+    MWYwMDdhZmVmODE1ODcyZTRiNzViZDQ3ZWJiNDZlNGM2Y2M2ZTk=
   data.tar.gz: !binary |-
-    NzhjMGQwMjg0YzIzYzcxMzJmODhkYTJkYmFkZmM0ZWM2NmQzN2ZmZmQxOWQw
-    NGE2YTJhNjJiMjg0NGZiOWE4MjhiYTdjNmZjZDYxZTY0YzljOWY1M2NiNTc2
-    NGM0ODQxNGJkNmM4YmVkYzFiMDNlNWM1ZmRjM2Y3NjM5ZDBkOTU=
+    Mzk4MDdhNGNhNWU1ZWM3OGVjZTZkZTI5YzMxNzE3YWY2NDM4YmExMzRiMjI4
+    M2U5YzBmZjFjYjVlNzE3MjhmZDlkZTQwYTBmMGU3MTM3OWViZjFlNjQzNGY4
+    MzMwOTM3ZjU0ODQ1YWFlZjZjNmJhYmU1MTdiMjQ3N2RjMTM5NjM=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fairway (0.3.3)
+    fairway (0.3.4)
       activesupport
       connection_pool
       redis

data/go/fairway_deliver.go

@@ -27,8 +27,8 @@ for i = 1, #registered_queues, 2 do
     local active_facets  = k(queue, 'active_facets');
     local round_robin    = k(queue, 'facet_queue');
     local facet_pool     = k(queue, 'facet_pool');
-    -- local inflight_facet = k(queue, facet .. ':inflight');
-    -- local inflight_limit = k(queue, 'limit');
+    local inflight_facet = k(queue, facet .. ':inflight');
+    local inflight_limit = k(queue, 'limit');
 
     -- Delivering the message to a queue is as simple as
     -- pushing it onto the facet's message list, and
@@ -39,18 +39,18 @@ for i = 1, #registered_queues, 2 do
     -- Manage facet queue and active facets
     local current       = tonumber(redis.call('hget', facet_pool, facet)) or 0;
     local priority      = tonumber(redis.call('hget', priorities, facet)) or 1;
-    -- local inflight_cur  = tonumber(redis.call('scard', inflight_facet)) or 0;
-    -- local inflight_max  = tonumber(redis.call('get', inflight_limit)) or 0;
+    local inflight_cur  = tonumber(redis.call('scard', inflight_facet)) or 0;
+    local inflight_max  = tonumber(redis.call('get', inflight_limit)) or 0;
 
     local n = 0
 
     -- redis.log(redis.LOG_WARNING, current.."/"..length.."/"..priority.."/"..inflight_max.."/"..inflight_cur);
 
-    -- if inflight_max > 0 then
-    --   n = math.min(length, priority, inflight_max - inflight_cur);
-    -- else
+    if inflight_max > 0 then
+      n = math.min(length, priority, inflight_max - inflight_cur);
+    else
       n = math.min(length, priority);
-    -- end
+    end
 
     -- redis.log(redis.LOG_WARNING, "PUSH: "..current.."/"..n);
 

data/lib/fairway/version.rb

@@ -1,3 +1,3 @@
 module Fairway
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/redis/fairway_deliver.lua

@@ -23,8 +23,8 @@ for i = 1, #registered_queues, 2 do
     local active_facets  = k(queue, 'active_facets');
     local round_robin    = k(queue, 'facet_queue');
     local facet_pool     = k(queue, 'facet_pool');
-    -- local inflight_facet = k(queue, facet .. ':inflight');
-    -- local inflight_limit = k(queue, 'limit');
+    local inflight_facet = k(queue, facet .. ':inflight');
+    local inflight_limit = k(queue, 'limit');
 
     -- Delivering the message to a queue is as simple as
     -- pushing it onto the facet's message list, and
@@ -35,18 +35,18 @@ for i = 1, #registered_queues, 2 do
     -- Manage facet queue and active facets
     local current       = tonumber(redis.call('hget', facet_pool, facet)) or 0;
     local priority      = tonumber(redis.call('hget', priorities, facet)) or 1;
-    -- local inflight_cur  = tonumber(redis.call('scard', inflight_facet)) or 0;
-    -- local inflight_max  = tonumber(redis.call('get', inflight_limit)) or 0;
+    local inflight_cur  = tonumber(redis.call('scard', inflight_facet)) or 0;
+    local inflight_max  = tonumber(redis.call('get', inflight_limit)) or 0;
 
     local n = 0
 
     -- redis.log(redis.LOG_WARNING, current.."/"..length.."/"..priority.."/"..inflight_max.."/"..inflight_cur);
 
-    -- if inflight_max > 0 then
-    --   n = math.min(length, priority, inflight_max - inflight_cur);
-    -- else
+    if inflight_max > 0 then
+      n = math.min(length, priority, inflight_max - inflight_cur);
+    else
       n = math.min(length, priority);
-    -- end
+    end
 
     -- redis.log(redis.LOG_WARNING, "PUSH: "..current.."/"..n);
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fairway
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - John Allison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport