fairway 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fairway (0.1.4)
+    fairway (0.2.1)
       activesupport
       redis
       redis-namespace (>= 1.3.0)

data/lib/fairway/config.rb

@@ -1,5 +1,13 @@
 module Fairway
-  class RandomPool
+  class RandomDistribution
+    class CannotConnect < RuntimeError; end
+
+    EXCEPTIONS = [
+      Redis::CannotConnectError,
+      Errno::ETIMEDOUT,
+      Errno::EHOSTUNREACH
+    ]
+
     attr_reader :pools
 
     def initialize(pools)
@@ -7,15 +15,37 @@ module Fairway
     end
 
     def with(&block)
-      @pools.sample.with do |conn|
-        yield(conn)
+      valid_pools = @pools
+
+      while valid_pools.any?
+        pool = valid_pools.sample
+
+        pool.with do |conn|
+          begin
+            return yield(conn)
+          rescue *EXCEPTIONS
+            valid_pools -= [pool]
+          end
+        end
+      end
+
+      raise CannotConnect.new
+    end
+
+    def with_each(&block)
+      @pools.each do |pool|
+        pool.with do |conn|
+          begin
+            yield(conn)
+          end
+        end
       end
     end
   end
 
   class Config
     attr_accessor :namespace
-    attr_reader :defined_queues, :redis_options
+    attr_reader :defined_queues, :redis_options, :distribute
 
     DEFAULT_FACET = "default"
 
@@ -24,6 +54,7 @@ module Fairway
     def initialize
       @redis_options  = []
       @namespace      = nil
+      @distribute     = RandomDistribution
       @facet          = lambda { |message| DEFAULT_FACET }
       @defined_queues = []
 
@@ -65,7 +96,7 @@ module Fairway
           pool(options) { Redis::Namespace.new(@namespace, redis: raw_redis(options)) }
         end
 
-        RandomPool.new(pools)
+        @distribute.new(pools)
       end
     end
 
@@ -76,7 +107,7 @@ module Fairway
           pool(options) { raw_redis(options) }
         end
 
-        RandomPool.new(pools)
+        @distribute.new(pools)
       end
     end
 

data/lib/fairway/queue.rb

@@ -10,12 +10,10 @@ module Fairway
     def active_facets
       facet_names = []
 
-      redis.pools.each do |pool|
-        pool.with do |conn|
-          facet_names += unique_queues.map do |queue|
-            conn.smembers("#{queue}:active_facets")
-          end.flatten
-        end
+      redis.with_each do |conn|
+        facet_names += unique_queues.map do |queue|
+          conn.smembers("#{queue}:active_facets")
+        end.flatten
       end
 
       facet_names.uniq.map do |name|

data/lib/fairway/scripts.rb

@@ -15,18 +15,14 @@ module Fairway
     end
 
     def register_queue(name, channel)
-      redis.pools.each do |pool|
-        pool.with do |conn|
-          conn.hset(registered_queues_key, name, channel)
-        end
+      redis.with_each do |conn|
+        conn.hset(registered_queues_key, name, channel)
       end
     end
 
     def unregister_queue(name)
-      redis.pools.each do |pool|
-        pool.with do |conn|
-          conn.hdel(registered_queues_key, name)
-        end
+      redis.with_each do |conn|
+        conn.hdel(registered_queues_key, name)
       end
     end
 
@@ -40,7 +36,7 @@ module Fairway
       loaded = false
 
       if multi?(method_name)
-        each_pool do |conn|
+        redis.with_each do |conn|
           conn.evalsha(script_sha(method_name), [namespace], args)
         end
       elsif first?(method_name)
@@ -54,7 +50,7 @@ module Fairway
       end
     rescue Redis::CommandError => ex
       if ex.message.include?("NOSCRIPT") && !loaded
-        each_pool do |conn|
+        redis.with_each do |conn|
           conn.script(:load, script_source(method_name))
         end
 
@@ -75,14 +71,6 @@ module Fairway
       ["fairway_priority", "fairway_destroy"].include?(script.to_s)
     end
 
-    def each_pool(&block)
-      redis.pools.each do |pool|
-        pool.with do |conn|
-          yield(conn)
-        end
-      end
-    end
-
     def first_pool(&block)
       redis.pools.each do |pool|
         pool.with do |conn|

data/lib/fairway/version.rb

@@ -1,3 +1,3 @@
 module Fairway
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/lib/fairway/config_spec.rb

@@ -30,14 +30,54 @@ module Fairway
     end
 
     it "allows multiple redis config" do
-      Config.new do |config|
+      config = Config.new do |config|
         config.redis = [
           { host: "127.0.0.1", port: 6379 },
           { host: "127.0.0.1", port: 6380 }
         ]
+      end
 
-        config.redis.pools.length.should == 2
+      config.redis.pools.length.should == 2
+    end
+
+    it "distributes requests randomly between multiple redis's" do
+      config = Config.new do |config|
+        config.redis = [
+          { host: "127.0.0.1", port: 6379 },
+          { host: "127.0.0.1", port: 6380 }
+        ]
+      end
+      
+      ports = []
+
+      20.times do
+        config.redis.with do |conn|
+          ports << conn.info["tcp_port"]
+        end
       end
+
+      ports.uniq.sort.should == ["6379", "6380"]
+    end
+
+    it "doesn't lose requests if one redis is down" do
+      config = Config.new do |config|
+        config.redis = [
+          { host: "127.0.0.1", port: 6379 },
+          { host: "127.0.0.1", port: 6380 },
+          { host: "127.0.0.1", port: 9999 }
+        ]
+      end
+      
+      ports = []
+
+      20.times do
+        config.redis.with do |conn|
+          ports << conn.info["tcp_port"]
+        end
+      end
+
+      ports.length.should == 20
+      ports.uniq.sort.should == ["6379", "6380"]
     end
 
     it "allows setting of connection pooling" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fairway
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport