Added support for connection_pool

Andrew Kane
1 parent 2edb71f2
Showing 6 changed files with 29 additions and 17 deletions Show diff stats
CHANGELOG.md
Gemfile
lib/searchkick.rb
lib/searchkick/index.rb
lib/searchkick/reindex_queue.rb
test/test_helper.rb
 ## 2.1.1 [unreleased]
 - Fixed duplicate notifications
+- Added support for `connection_pool`
 ## 2.1.0
@@ -9,3 +9,4 @@ gem &quot;gemoji-parser&quot;
 gem "typhoeus"
 gem "activejob"
 gem "redis"
+gem "connection_pool"
@@ -145,6 +145,18 @@ module Searchkick
     end
   end
+  def self.with_redis
+    if redis
+      if redis.respond_to?(:with)
+        redis.with do |r|
+          yield r
+        end
+      else
+        yield redis
+      end
+    end
+  end
+
   # private
   def self.load_records(records, ids)
     records =
@@ -258,7 +258,7 @@ module Searchkick
       if batch
         import_or_update scope.to_a, method_name, async
-        redis.srem(batches_key, batch_id) if batch_id && redis
+        Searchkick.with_redis { |r| r.srem(batches_key, batch_id) } if batch_id
       elsif full && async
         full_reindex_async(scope)
       elsif scope.respond_to?(:find_in_batches)
@@ -283,7 +283,7 @@ module Searchkick
     end
     def batches_left
-      redis.scard(batches_key) if redis
+      Searchkick.with_redis { |r| r.scard(batches_key) }
     end
     # other
@@ -459,7 +459,7 @@ module Searchkick
         index_name: name,
         batch_id: batch_id
       }.merge(options))
-      redis.sadd(batches_key, batch_id) if redis
+      Searchkick.with_redis { |r| r.sadd(batches_key, batch_id) }
     end
     def batch_size
@@ -492,10 +492,6 @@ module Searchkick
       Searchkick.indexer.queue(records.map { |r| {update: record_data(r).merge(data: {doc: search_data(r, method_name)})} })
     end
-    def redis
-      Searchkick.redis
-    end
-
     def batches_key
       "searchkick:reindex:#{name}:batches"
     end
@@ -5,36 +5,32 @@ module Searchkick
     def initialize(name)
       @name = name
-      raise Searchkick::Error, "Searchkick.redis not set" unless redis
+      raise Searchkick::Error, "Searchkick.redis not set" unless Searchkick.redis
     end
     def push(record_id)
-      redis.lpush(redis_key, record_id)
+      Searchkick.with_redis { |r| r.lpush(redis_key, record_id) }
     end
     # TODO use reliable queuing
     def reserve(limit: 1000)
       record_ids = Set.new
-      while record_ids.size < limit && record_id = redis.rpop(redis_key)
+      while record_ids.size < limit && record_id = Searchkick.with_redis { |r| r.rpop(redis_key) }
         record_ids << record_id
       end
       record_ids.to_a
     end
     def clear
-      redis.del(redis_key)
+      Searchkick.with_redis { |r| r.del(redis_key) }
     end
     def length
-      redis.llen(redis_key)
+      Searchkick.with_redis { |r| r.llen(redis_key) }
     end
     private
-    def redis
-      Searchkick.redis
-    end
-
     def redis_key
       "searchkick:reindex_queue:#{name}"
     end
@@ -14,7 +14,13 @@ File.delete(&quot;elasticsearch.log&quot;) if File.exist?(&quot;elasticsearch.log&quot;)
 Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
 Searchkick.search_timeout = 5
-Searchkick.redis = Redis.new if defined?(Redis)
+if defined?(Redis)
+  if defined?(ConnectionPool)
+    Searchkick.redis = ConnectionPool.new { Redis.new }
+  else
+    Searchkick.redis = Redis.new
+  end
+end
 puts "Running against Elasticsearch #{Searchkick.server_version}"
1	## 2.1.1 [unreleased]	1	## 2.1.1 [unreleased]
2		2
3	- Fixed duplicate notifications	3	- Fixed duplicate notifications
		4	+- Added support for `connection_pool`
4		5
5	## 2.1.0	6	## 2.1.0
6		7
	@@ -9,3 +9,4 @@ gem "gemoji-parser"		@@ -9,3 +9,4 @@ gem "gemoji-parser"
9	gem "typhoeus"	9	gem "typhoeus"
10	gem "activejob"	10	gem "activejob"
11	gem "redis"	11	gem "redis"
		12	+gem "connection_pool"
	@@ -145,6 +145,18 @@ module Searchkick		@@ -145,6 +145,18 @@ module Searchkick
145	end	145	end
146	end	146	end
147		147
		148	+ def self.with_redis
		149	+ if redis
		150	+ if redis.respond_to?(:with)
		151	+ redis.with do \|r\|
		152	+ yield r
		153	+ end
		154	+ else
		155	+ yield redis
		156	+ end
		157	+ end
		158	+ end
		159	+
148	# private	160	# private
149	def self.load_records(records, ids)	161	def self.load_records(records, ids)
150	records =	162	records =