redis-stream 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f717daecee4d177674a113217514c86d58fbb833fbd7e3a8751263f1c110b26a
-  data.tar.gz: a78aef2ebb19708c634c02e87b2039b1f1ceb7f3a04cc1aeecc929076130f35c
+  metadata.gz: 2003a3a4fd95c727e14279d50acf299abd6737a41e35d9f158423ba66403800d
+  data.tar.gz: 6677b422a7740963c3076a3bf832ff1a65ce26cb75345123847fc8b598574c32
 SHA512:
-  metadata.gz: 380bfb8e1ea254d1e9cb3ab5d0c0367eaefe350671cc85ac0e7c34d9512965a9a00e7840745f759b45f172ad91d78db1e4774a39d542410f2b1cc6072a95be68
-  data.tar.gz: f0531ee5f9e2cc442ec9339c3935e0bd83c6930fe4e3476d843505c985f9d3f814e9ce44e584ed243f8cd4f7e27da45efad76605252ecf705cf01c898880a33d
+  metadata.gz: 518e77d3732aff505a6303fe4e2bed3b26e172a9ecc1b1ddeda4025097414cc310c591aeac800d27d3feec7e2bc2a86e57fa2a454c4b6cfcac76155cd7ccd809
+  data.tar.gz: 0b81242d27148e2fc71787e7cc62a29abf1edaa28c4b81a9f29135c48a8def5edcc2a282fe78b9c945e560203d951b7e9d9ab44315b9507df41655c24147638a

data/Gemfile.lock

@@ -2,6 +2,7 @@ PATH
   remote: .
   specs:
     redis-stream (0.4.6)
+      connection_pool (~> 2.2)
       moneta (~> 1.2)
       multi_json (~> 1.14)
       redis (= 4.1.3)
@@ -10,6 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    connection_pool (2.2.2)
     json (2.3.0)
     minitest (5.13.0)
     moneta (1.2.1)

data/lib/redis/stream/client.rb

@@ -1,5 +1,6 @@
 #encoding: UTF-8
 require "redis"
+require "connection_pool"
 require "logger"
 require "json"
 require "thread"
@@ -46,19 +47,19 @@ class Redis
         @group = group_name
         if options.include?('redis')
           @logger.info("Taking REDIS as a parameter")
-          @redis = options['redis']
+          @redis_pool = ConnectionPool.new(size: 10, timeout: 5) { options['redis'] }
         elsif Redis::Stream::Config.file_exists? && Redis::Stream::Config.include?(:redis)
           @logger.info("Taking REDIS from config file")
-          @redis = Redis.new(Redis::Stream::Config[:redis])
+          @redis_pool = ConnectionPool.new(size: 10, timeout: 5) { Redis.new(Redis::Stream::Config[:redis]) }
         else
           @logger.info("Instantiating REDIS")
-          @redis = Redis.new(host: host, port: port, db: db)
+          @redis_pool = ConnectionPool.new(size: 10, timeout: 5) { Redis.new(host: host, port: port, db: db) }
         end
         @consumer_id = "#{@name}-#{@group}-#{Process.pid}"
         @non_blocking = nil
         #  @send_queue = []
 
-        raise "No redis" if @redis.nil?
+        raise "No redis" if @redis_pool.nil? || @redis_pool.available == 0
 
         if options.has_key?('tracer') && !options['tracer'].nil?
           OpenTracing.global_tracer = options["tracer"]
@@ -89,7 +90,10 @@ class Redis
           to = options["to"]
           group = options["group"]
           payload = build_payload(data, options)
-          add_id = @redis.xadd(@stream, payload)
+          add_id = nil
+          @redis_pool.with do |redis|
+            add_id = redis.xadd(@stream, payload)
+          end
 
           @logger.info("#{@consumer_id} - send to '#{to}' in group '#{group}' with id '#{add_id}' of type '#{type}'")
         end
@@ -265,7 +269,9 @@ class Redis
       def setup_stream
         if @group
           begin
-            @redis.xgroup(:create, @stream, @group, '$', mkstream: true)
+            @redis_pool.with do |redis|
+              redis.xgroup(:create, @stream, @group, '$', mkstream: true)
+            end
             @logger.info("#{@consumer_id} - Group #{@group} created")
           rescue Redis::CommandError => e
             @logger.error("#{@consumer_id} - Group #{@group} exists")
@@ -306,13 +312,17 @@ class Redis
       # @param [Boolean] passthrough    Receive all messages also the ones intended for other consumers
       def read_next_message_from_stream(async = true, passthrough = false)
         if @state == Redis::Stream::State::RUNNING
-          result = @redis.xread(@stream, @lastid, block: 1000, count: 1) if @group.nil?
-          result = @redis.xreadgroup(@group, @consumer_id, @stream, '>', block: 1000, count: 1) if @group
-
+          result = nil
+          @redis_pool.with do |redis|
+            result = redis.xread(@stream, @lastid, block: 1000, count: 1) if @group.nil?
+            result = redis.xreadgroup(@group, @consumer_id, @stream, '>', block: 1000, count: 1) if @group
+          end
           unless result.empty?
             id, data_out = result[@stream][0]
-            ack_count = @redis.xack(@stream, @group, id) if @group
-
+            ack_count = 0
+            @redis_pool.with do |redis|
+              ack_count = redis.xack(@stream, @group, id) if @group
+            end
             tracer_data = JSON.parse(data_out["tracer"])
             unless tracer_data.nil? || tracer_data.empty?
               #trace_scope.span.log_kv('has_tracer' => true)

data/lib/redis/stream/inspect.rb

@@ -3,34 +3,46 @@ class Redis
   module Stream
     module Inspect
       def groups
-        @redis.xinfo("groups", @stream)
+        @redis_pool.with do |redis|
+          redis.xinfo("groups", @stream)
+        end
       rescue Exception => e
         @logger.error("#{@consumer_id} - #{e.message}")
         {}
       end
 
       def info
-        @redis.xinfo("stream", @stream)
+        @redis_pool.with do |redis|
+          redis.xinfo("stream", @stream)
+        end
       end
 
       def consumers(group = @group)
-        @redis.xinfo("consumers", @stream, group)
+        @redis_pool.with do |redis|
+          redis.xinfo("consumers", @stream, group)
+        end
       end
 
       def del_consumer(group = @group, consumer = @consumer_id)
         @logger.info("#{@consumer_id} - deleting consumer #{group}-#{consumer}")
-        @redis.xgroup('DELCONSUMER', @stream, group, consumer)
+        @redis_pool.with do |redis|
+          redis.xgroup('DELCONSUMER', @stream, group, consumer)
+        end
       end
 
       def del_group(group = @group)
         if consumers(group).length == 0 && groups.map { |m| m["name"] }.include?(group)
           @logger.info("#{@consumer_id} - deleting group #{group}")
-          @redis.xgroup('DESTROY', @stream, group)
+          @redis_pool.with do |redis|
+            redis.xgroup('DESTROY', @stream, group)
+          end
         end
       end
 
       def pending_messages
-        @redis.xrange(@stream)
+        @redis_pool.with do |redis|
+          redis.xrange(@stream)
+        end
       end
     end #Inspect
   end #Stream

data/lib/redis/stream/version.rb

@@ -1,6 +1,6 @@
 #encoding: UTF-8
 class Redis
   module Stream
-    VERSION = "0.4.6"
+    VERSION = "0.4.7"
   end
 end

data/redis-stream.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_dependency "redis", "4.1.3"
+  spec.add_dependency "connection_pool", "~> 2.2"
   spec.add_dependency "moneta", "~> 1.2"
   spec.add_dependency "multi_json", "~> 1.14"
   spec.add_dependency "zipkin", "~> 1.6.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-stream
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Mehmet Celik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.1.3
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement