rafka 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 298aa80cafed24d522c37312a86bac1f81b74f79
-  data.tar.gz: c282176e68fa39923a14850f84690f2a4f897a8a
+SHA256:
+  metadata.gz: f4b1340d7d6aed3fc3151f8655993b1a197016be9dd8537856118fca48d305bb
+  data.tar.gz: 4741170487839f7087b9637e7473a7ac4e005e339c34ef9886aabd984873afe5
 SHA512:
-  metadata.gz: 5dc4609117de5fed0965b0c0a842eb52d2d476c5be19676ea6fc6d188d6f7d9122097df2923887a3275db762bbf97c39b6e1797b757a8a8cdfbfe5cbc520134e
-  data.tar.gz: e9eb72063aa3ba0396205b6b6791d228bab9106d2c02bde5064232608cf235f3bfb4c7007ebd5147e588604b8bd4e072cfd0920b5e83be21ff6e4a8d68522626
+  metadata.gz: f1c285aae295bb0c5b0f575116ba2734f57b2117b3555ba272d97a18ea8bde86ecde1d1308063d3310b351657b4e6f70514bca9842498ed92717254ce0c6daad
+  data.tar.gz: 0a69e03ccc7344446f3f77c239d43a99c6d5e19567a4833ef0458cf13a82497ba4e67c6935698ba99c9764dfc42e133e0173d867114228d54c1768a543d56679

data/CHANGELOG.md

@@ -4,6 +4,11 @@ Breaking changes are prefixed with a "[BREAKING]" label.
 
 ## master (unreleased)
 
+## 0.5.0 (2019-10-09)
+
+## Changed
+
+- Consumer operations are now restarted upon `Rafka::ConsumeError: Server shutdown` exceptions (i.e. during server restarts) [[#27](https://github.com/skroutz/rafka-rb/pull/27)]
 
 ## 0.4.1 (2018-23-05)
 

data/lib/rafka.rb

@@ -14,6 +14,12 @@ module Rafka
     port: 6380
   }.freeze
 
+  # Server errors upon which we should retry the operation.
+  RETRIABLE_ERRORS = [
+    "CONS Server shutdown"
+  ].freeze
+
+  # Wraps errors from redis-rb to our own error classes
   def self.wrap_errors
     yield
   rescue Redis::CommandError => e
@@ -21,4 +27,21 @@ module Rafka
     raise ConsumeError, e.message[5..-1] if e.message.start_with?("CONS ")
     raise CommandError, e.message
   end
+
+  # Retries the operation upon Redis::CommandError
+  def self.with_retry(max_retries=15)
+    retries = 0
+
+    begin
+      yield
+    rescue Redis::CommandError => e
+      if RETRIABLE_ERRORS.include?(e.message) && retries < max_retries
+        sleep 1
+        retries += 1
+        retry
+      end
+
+      raise e
+    end
+  end
 end

data/lib/rafka/consumer.rb

@@ -61,7 +61,8 @@ module Rafka
     # {#commit}.
     #
     # @param timeout [Fixnum] the time in seconds to wait for a message. If
-    #   reached, {#consume} returns nil.
+    #   reached, {#consume} returns nil. Must be smaller than or equal to the underlying Redis client's
+    #   `read_timeout` which superseeds the current timeout.
     #
     # @yieldparam [Message] msg the consumed message
     #
@@ -239,7 +240,9 @@ module Rafka
       msg = nil
 
       Rafka.wrap_errors do
-        msg = @redis.blpop(@blpop_arg, timeout: timeout)
+        Rafka.with_retry do
+          msg = @redis.blpop(@blpop_arg, timeout: timeout)
+        end
       end
 
       msg = Message.new(msg) if msg

data/lib/rafka/producer.rb

@@ -46,10 +46,14 @@ module Rafka
       end
     end
 
-    # Flush any buffered messages. Blocks until all messages are written or the
-    # given timeout exceeds.
+    # Flush any outstanding messages. The server will block until all messages
+    # are written or the provided timeout is exceeded. Note however, that the
+    # provided timeout may be overshot by the `read_timeout` setting of the
+    # underlying Redis client. This means that the client might interrupt the
+    # call earlier than timeout_ms, if `read_timeout` is less than `timeout_ms`.
     #
-    # @param timeout_ms [Fixnum]
+    # @param timeout_ms [Fixnum]. Must be smaller than or equal to the underlying Redis client's `read_timeout`
+    #   which superseeds the current timeout.
     #
     # @return [Fixnum] The number of unflushed messages
     def flush(timeout_ms=5000)

data/lib/rafka/version.rb

@@ -1,3 +1,3 @@
 module Rafka
-  VERSION = "0.4.1".freeze
+  VERSION = "0.5.0".freeze
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rafka
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Agis Anastasopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -118,8 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Ruby driver for Rafka