cloudtasker 0.10.rc4 → 0.10.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 228f7fc8ef7ca52a1a9827b233ae1ebfea77e2a6d6683d68caa3fffef697ffb4
-  data.tar.gz: b58fee4392d02847c462684744a5b90ff413564a02e3e74b51514b7f8aee4107
+  metadata.gz: db7ce2488df7c451c0ed08a2674c32e6e5964a926ad8bf158fee3e76ec71ee82
+  data.tar.gz: 354177692074ddf3aa74fb1dba70dd56933211b460f035884fbf34bc87dc89fc
 SHA512:
-  metadata.gz: 88d7bfd9d4bbdb38ca48cf5e3af1fd9f901a3f89b84bce7d41609baa22d7ded5ce0c3a657d8aaaa9ad3b9274ad389825bdd7e17272f65ef80a68c6cb96538d25
-  data.tar.gz: b0a1f08dd892a9c709ecb24fb9a38c6507489179ce06779e49c9641d1ed849b02af6c3717476d85e7cf852879d0a5c8429123bc843a4ce60933f8319d0241e5a
+  metadata.gz: 627dc29f6318bc4f0f676deea5ea932f6ec6414cf7f98c3f986132de59c44d30db5d645c518a04bf98ca99925719efce7a430a48a85d83be1cd90551a5f8206a
+  data.tar.gz: e9806327d16e5ac6700577732cc9347f403eb21c6debd52cbacb36157af110a3ccab917e01fab9d6cd87d98ae0cfa1558fe7ebf0d1a938d4a0b40a13a492e87d

data/cloudtasker.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
+  spec.add_dependency 'connection_pool'
   spec.add_dependency 'fugit'
   spec.add_dependency 'google-cloud-tasks'
   spec.add_dependency 'jwt'

data/lib/cloudtasker/redis_client.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'redis'
+require 'connection_pool'
 
 module Cloudtasker
   # A wrapper with helper methods for redis
@@ -10,8 +11,18 @@ module Cloudtasker
     LOCK_DURATION = 2 # seconds
     LOCK_WAIT_DURATION = 0.03 # seconds
 
+    # Default pool size used for Redis
+    DEFAULT_POOL_SIZE = ENV.fetch('RAILS_MAX_THREADS') { 25 }
+    DEFAULT_POOL_TIMEOUT = 5
+
     def self.client
-      @client ||= Redis.new(Cloudtasker.config.redis || {})
+      @client ||= begin
+        pool_size = Cloudtasker.config.redis&.dig(:pool_size) || DEFAULT_POOL_SIZE
+        pool_timeout = Cloudtasker.config.redis&.dig(:pool_timeout) || DEFAULT_POOL_TIMEOUT
+        ConnectionPool.new(size: pool_size, timeout: pool_timeout) do
+          Redis.new(Cloudtasker.config.redis || {})
+        end
+      end
     end
 
     #
@@ -31,7 +42,7 @@ module Cloudtasker
     # @return [Hash, Array] The content of the cache key, parsed as JSON.
     #
     def fetch(key)
-      return nil unless (val = client.get(key.to_s))
+      return nil unless (val = get(key.to_s))
 
       JSON.parse(val, symbolize_names: true)
     rescue JSON::ParserError
@@ -47,7 +58,7 @@ module Cloudtasker
     # @return [String] Redis response code.
     #
     def write(key, content)
-      client.set(key.to_s, content.to_json)
+      set(key.to_s, content.to_json)
     end
 
     #
@@ -70,12 +81,14 @@ module Cloudtasker
 
       # Wait to acquire lock
       lock_key = [LOCK_KEY_PREFIX, cache_key].join('/')
-      sleep(LOCK_WAIT_DURATION) until client.set(lock_key, true, nx: true, ex: LOCK_DURATION)
+      client.with do |conn|
+        sleep(LOCK_WAIT_DURATION) until conn.set(lock_key, true, nx: true, ex: LOCK_DURATION)
+      end
 
       # yield content
       yield
     ensure
-      client.del(lock_key)
+      del(lock_key)
     end
 
     #
@@ -104,10 +117,12 @@ module Cloudtasker
       list = []
 
       # Scan and capture matching keys
-      while cursor != 0
-        scan = client.scan(cursor || 0, match: pattern)
-        list += scan[1]
-        cursor = scan[0].to_i
+      client.with do |conn|
+        while cursor != 0
+          scan = conn.scan(cursor || 0, match: pattern)
+          list += scan[1]
+          cursor = scan[0].to_i
+        end
       end
 
       list
@@ -123,8 +138,8 @@ module Cloudtasker
     # @return [Any] The method return value
     #
     def method_missing(name, *args, &block)
-      if client.respond_to?(name)
-        client.send(name, *args, &block)
+      if Redis.method_defined?(name)
+        client.with { |c| c.send(name, *args, &block) }
       else
         super
       end
@@ -139,7 +154,7 @@ module Cloudtasker
     # @return [Boolean] Return true if the class respond to this method.
     #
     def respond_to_missing?(name, include_private = false)
-      client.respond_to?(name) || super
+      Redis.method_defined?(name) || super
     end
   end
 end

data/lib/cloudtasker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cloudtasker
-  VERSION = '0.10.rc4'
+  VERSION = '0.10.rc5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudtasker
 version: !ruby/object:Gem::Version
-  version: 0.10.rc4
+  version: 0.10.rc5
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fugit
   requirement: !ruby/object:Gem::Requirement