fairway 0.2.0 → 0.2.1

data/lib/fairway/config.rb

@@ -1,4 +1,18 @@
 module Fairway
+  class RandomPool
+    attr_reader :pools
+
+    def initialize(pools)
+      @pools = pools
+    end
+
+    def with(&block)
+      @pools.sample.with do |conn|
+        yield(conn)
+      end
+    end
+  end
+
   class Config
     attr_accessor :namespace
     attr_reader :defined_queues, :redis_options
@@ -8,7 +22,7 @@ module Fairway
     QueueDefinition = Struct.new(:name, :channel)
 
     def initialize
-      @redis_options  = {}
+      @redis_options  = []
       @namespace      = nil
       @facet          = lambda { |message| DEFAULT_FACET }
       @defined_queues = []
@@ -29,32 +43,54 @@ module Fairway
     end
 
     def redis=(options)
-      @redis_options = options
+      @redis_options = [options].flatten
     end
 
     def redis
-      @redis ||= pool { Redis::Namespace.new(@namespace, redis: raw_redis) }
+      @redis ||= redises
     end
 
     def scripts
       @scripts ||= begin
-        Scripts.new(pool { raw_redis }, @namespace)
+        Scripts.new(raw_redises, @namespace)
       end
     end
 
     private
 
-    def pool(&block)
-      pool_size    = @redis_options[:pool]    || 1
-      pool_timeout = @redis_options[:timeout] || 5
+    def redises
+      @redises ||= begin
+        @redis_options << {} if @redis_options.empty?
+        pools = @redis_options.map do |options|
+          pool(options) { Redis::Namespace.new(@namespace, redis: raw_redis(options)) }
+        end
+
+        RandomPool.new(pools)
+      end
+    end
+
+    def raw_redises
+      @raw_redises ||= begin
+        @redis_options << {} if @redis_options.empty?
+        pools = @redis_options.map do |options|
+          pool(options) { raw_redis(options) }
+        end
+
+        RandomPool.new(pools)
+      end
+    end
+
+    def pool(options, &block)
+      pool_size    = options[:pool]    || 1
+      pool_timeout = options[:timeout] || 5
 
       ConnectionPool.new(size: pool_size, timeout: pool_timeout) do
         yield
       end
     end
 
-    def raw_redis
-      Redis.new(@redis_options)
+    def raw_redis(options)
+      Redis.new(options)
     end
   end
 end

data/lib/fairway/facet.rb

@@ -10,11 +10,13 @@ module Fairway
     end
 
     def length
-      redis.with do |conn|
-        each_queue do |queue|
-          conn.llen(facet_key(queue))
-        end.sum
-      end
+      redis.pools.map do |pool|
+        pool.with do |conn|
+          each_queue do |queue|
+            conn.llen(facet_key(queue))
+          end.sum
+        end
+      end.sum
     end
 
     def priority

data/lib/fairway/queue.rb

@@ -8,21 +8,27 @@ module Fairway
     end
 
     def active_facets
-      redis.with do |conn|
-        facet_names = unique_queues.map do |queue|
-          conn.smembers("#{queue}:active_facets")
-        end.flatten.uniq
-      
-        facet_names.map do |name|
-          Facet.new(self, name)
+      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
       end
+
+      facet_names.uniq.map do |name|
+        Facet.new(self, name)
+      end
     end
 
     def length
-      redis.with do |conn|
-        conn.mget(unique_queues.map{|q| "#{q}:length" }).map(&:to_i).sum
-      end
+      redis.pools.map do |pool|
+        pool.with do |conn|
+          conn.mget(unique_queues.map{|q| "#{q}:length" }).map(&:to_i).sum
+        end
+      end.sum
     end
 
     def peek

data/lib/fairway/scripts.rb

@@ -15,14 +15,18 @@ module Fairway
     end
 
     def register_queue(name, channel)
-      redis.with do |conn|
-        conn.hset(registered_queues_key, name, channel)
+      redis.pools.each do |pool|
+        pool.with do |conn|
+          conn.hset(registered_queues_key, name, channel)
+        end
       end
     end
 
     def unregister_queue(name)
-      redis.with do |conn|
-        conn.hdel(registered_queues_key, name)
+      redis.pools.each do |pool|
+        pool.with do |conn|
+          conn.hdel(registered_queues_key, name)
+        end
       end
     end
 
@@ -35,12 +39,22 @@ module Fairway
     def method_missing(method_name, *args)
       loaded = false
 
-      redis.with do |conn|
-        conn.evalsha(script_sha(method_name), [namespace], args)
+      if multi?(method_name)
+        each_pool do |conn|
+          conn.evalsha(script_sha(method_name), [namespace], args)
+        end
+      elsif first?(method_name)
+        first_pool do |conn|
+          conn.evalsha(script_sha(method_name), [namespace], args)
+        end
+      else
+        redis.with do |conn|
+          conn.evalsha(script_sha(method_name), [namespace], args)
+        end
       end
     rescue Redis::CommandError => ex
       if ex.message.include?("NOSCRIPT") && !loaded
-        redis.with do |conn|
+        each_pool do |conn|
           conn.script(:load, script_source(method_name))
         end
 
@@ -53,6 +67,33 @@ module Fairway
 
   private
 
+    def first?(script)
+      ["fairway_pull", "fairway_peek"].include?(script.to_s)
+    end
+
+    def multi?(script)
+      ["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|
+          val = yield(conn)
+          return val if val
+        end
+      end
+
+      nil
+    end
+
     def registered_queues_key
       "#{namespace}registered_queues"
     end

data/lib/fairway/version.rb

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

data/spec/lib/fairway/config_spec.rb

@@ -29,19 +29,30 @@ module Fairway
       end
     end
 
+    it "allows multiple redis config" do
+      Config.new do |config|
+        config.redis = [
+          { host: "127.0.0.1", port: 6379 },
+          { host: "127.0.0.1", port: 6380 }
+        ]
+
+        config.redis.pools.length.should == 2
+      end
+    end
+
     it "allows setting of connection pooling" do
       config = Config.new do |config|
         config.redis = { pool: 10 }
       end
 
-      config.redis.instance_variable_get("@size").should == 10
+      config.redis.pools.first.instance_variable_get("@size").should == 10
     end
 
     it "defaults to pool of 1" do
       config = Config.new do |config|
       end
 
-      config.redis.instance_variable_get("@size").should == 1
+      config.redis.pools.first.instance_variable_get("@size").should == 1
     end
 
     it "allows setting of redis namespace" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fairway
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: