cache_store_redis 0.4.2-java → 0.5.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7648636075a74c0e4bd9c6f7ae51605c0b57184b1298ca64d53bee697b3e515
-  data.tar.gz: c560d50aa53e1dd6d9d067c38698d2d6c44d0684a5eeb1c99fd2a0592dd48358
+  metadata.gz: 66c8348a23aae76d29cae462e4dac22e9b433059a6c3fcdcdff6c369f77b4f3d
+  data.tar.gz: d448b2da6efb3fd89c5692233a29c5416e49e8741ecb12ee9cab6d35e88e8607
 SHA512:
-  metadata.gz: 2bfe8206e8dea8747f6a1042778a85e579327680d7f620cdd666188932b975af0fd9810ea255aa456fe65d161e694c2a17ab10cd6457eda7ea657b35914016b3
-  data.tar.gz: 01d3871337057dd60c949a5922d01c4919b0844deaa373e13dd0b9c4140c86962ab3e2e691c9e64be226911bb5db79c3859e19955eb67f4978d3fe9e7c912176
+  metadata.gz: 30df78134211b7e1e92a1af37acf35e8f8ddc169e0124ef7f4d707330f113ac44bb0de8e8cb8657cb46e4ddcd40d07fe67838ddbc6d231507bf0efe5365af3c0
+  data.tar.gz: e21a1afc728d7e1b884135328463d4da7e987e6546383194f49f7e2c536bbaff5467ef8d98f0adb7e9ac3aaa28c076edd00defeb7f295d484030c8cdc939c8f1

data/lib/cache_store_redis/version.rb

@@ -1,3 +1,3 @@
 module CacheStoreRedis
-  VERSION = '0.4.2'
+  VERSION = '0.5.4'
 end

data/lib/cache_store_redis.rb

@@ -1,110 +1,163 @@
+# frozen_string_literal: true
+
+require 'thread'
 require 'cache_store_redis/version'
 require 'redis'
 require 'securerandom'
-require 'connection_pool'
 
-#This class is used to implement a redis cache store.
-#This class is used for interacting with a redis based cache store.
+# This class is used to implement a redis cache store.
 class RedisCacheStore
-
-  def self.pool(config)
-    @pool ||= ConnectionPool.new(size: pool_size, timeout: pool_timeout) do
-      if config == nil
-        Redis.new
-      else
-        Redis.new(config)
-      end
+  def initialize(namespace = nil, config = nil)
+    unless RUBY_PLATFORM == 'java'
+      require 'oj'
     end
-  end
 
-  def self.pool_size
-    @pool_size ||= ENV['CACHE_STORE_POOL_SIZE'] || 10
-  end
+    @namespace = namespace
+    @config = config
+    @queue = Queue.new
 
-  def self.pool_timeout
-    @pool_size ||= ENV['CACHE_STORE_POOL_TIMEOUT'] || 1
+    @connections_created = 0
+    @connections_in_use = 0
+    @mutex = Mutex.new
+    @enable_stats = false
   end
 
-  def initialize(namespace = nil, config = nil)
+  def enable_stats=(value)
+    @enable_stats = value
+  end
 
-    if RUBY_PLATFORM != 'java'
-      require 'oj'
+  def increment_created_stat
+    @mutex.synchronize do
+      @connections_created += 1
     end
+  end
 
-    @namespace = namespace
-    @config = config
+  def increment_using_stat
+    @mutex.synchronize do
+      @connections_in_use += 1
+    end
   end
 
-  def with_client
-    self.class.pool(@config).with do |client|
-      yield client
+  def decrement_using_stat
+    @mutex.synchronize do
+      @connections_in_use -= 1
     end
   end
 
-  #This method is called to configure the connection to the cache store.
-  def configure(host = 'localhost', port = 6379, db = 'default', password = nil, driver: nil, url: nil)
-    if url != nil
+  # This method is called to configure the connection to the cache store.
+  def configure(host = 'localhost',
+                port = 6379,
+                db = 'default',
+                password = nil,
+                driver: nil,
+                url: nil,
+                connect_timeout: 0.5,
+                read_timeout: 1,
+                write_timeout: 0.5)
+    if !url.nil?
       @config = {}
       @config[:url] = url
       @config[:db] = db
     else
-      @config = { :host => host, :port => port, :db => db }
+      @config = { host: host, port: port, db: db }
     end
-    if password != nil
-      @config[:password] = password
+
+    @config[:password] = password unless password.nil?
+    @config[:driver] = driver unless driver.nil?
+
+    @config[:connect_timeout] = connect_timeout
+    @config[:read_timeout] = read_timeout
+    @config[:write_timeout] = write_timeout
+  end
+
+  def fetch_client
+    begin
+      @queue.pop(true)
+    rescue
+      increment_created_stat
+      Redis.new(@config)
     end
-    if driver != nil
-      @config[:driver] = driver
+  end
+
+  def clean
+    while @queue.length.positive?
+      client = @queue.pop(true)
+      client.close
+    end
+  end
+
+  def log_stats
+    return unless @enable_stats == true
+    S1Logging.logger.debug do
+      "[#{self.class}] - REDIS Connection Stats. Process: #{Process.pid} | " \
+"Created: #{@connections_created} | Pending: #{@queue.length} | In use: #{@connections_in_use}"
     end
   end
 
-  #This method is called to set a value within this cache store by it's key.
+  def with_client
+    log_stats
+    begin
+      client = fetch_client
+      increment_using_stat
+      log_stats
+      yield client
+    ensure
+      @queue.push(client)
+      decrement_using_stat
+      log_stats
+    end
+  end
+
+  # This method is called to set a value within this cache store by it's key.
   #
   # @param key [String] This is the unique key to reference the value being set within this cache store.
   # @param value [Object] This is the value to set within this cache store.
   # @param expires_in [Integer] This is the number of seconds from the current time that this value should expire.
   def set(key, value, expires_in = 0)
-    v = nil
     k = build_key(key)
 
-    if value != nil
-      v = serialize(value)
-    end
+    v = if value.nil? || (value.is_a?(String) && value.strip.empty?)
+          nil
+        else
+          serialize(value)
+        end
 
     with_client do |client|
       client.multi do
         client.set(k, v)
 
-        if expires_in > 0
-          client.expire(k, expires_in)
-        end
+        client.expire(k, expires_in) if expires_in.positive?
       end
     end
-
   end
 
-  #This method is called to get a value from this cache store by it's unique key.
+  # This method is called to get a value from this cache store by it's unique key.
   #
   # @param key [String] This is the unique key to reference the value to fetch from within this cache store.
-  # @param expires_in [Integer] This is the number of seconds from the current time that this value should expire. (This is used in conjunction with the block to hydrate the cache key if it is empty.)
-  # @param &block [Block] This block is provided to hydrate this cache store with the value for the request key when it is not found.
+  # @param expires_in [Integer] This is the number of seconds from the current time that this value should expire.
+  # (This is used in conjunction with the block to hydrate the cache key if it is empty.)
+  # @param &block [Block] This block is provided to hydrate this cache store with the value for the request key
+  # when it is not found.
   # @return [Object] The value for the specified unique key within the cache store.
   def get(key, expires_in = 0, &block)
-
     k = build_key(key)
 
     value = with_client do |client|
       client.get(k)
     end
 
-    value = deserialize(value) unless value == nil
+    if !value.nil? && value.delete('\"').strip.empty?
+      value = nil
+    else
+      value = deserialize(value) unless value.nil?
+    end
 
     if value.nil? && block_given?
       value = yield
-      set(k, value, expires_in)
+      set(key, value, expires_in)
     end
 
-    return value
+    value
   end
 
   # This method is called to remove a value from this cache store by it's unique key.
@@ -135,7 +188,6 @@ class RedisCacheStore
     end
   end
 
-
   private
 
   def serialize(object)
@@ -155,13 +207,10 @@ class RedisCacheStore
   end
 
   def build_key(key)
-    k = ''
-    if @namespace != nil
-      k = @namespace + ':' + key.to_s
-    elsif
-      k = key.to_s
+    if !@namespace.nil?
+      @namespace + ':' + key.to_s
+    else
+      key.to_s
     end
-    k
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cache_store_redis
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.4
 platform: java
 authors:
 - vaughanbrittonsage
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: connection_pool
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This is the redis cache_store implementation.
 email:
 - vaughan.britton@sage.com