rafka 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ae73debb337586cf11886beb47e5d66d67d27d2
-  data.tar.gz: 3d62f4c45b95bd07fab9b9962df6f50e1fea029a
+  metadata.gz: 4b373f61cafd171166bb214fca2e36d3f7e36c40
+  data.tar.gz: 3baee498081c2aabfd195074cdb2695ad5b4711a
 SHA512:
-  metadata.gz: e21831f41604c1365b4d2af812edc060fbe5dd7e836b70b9c31b301bced22cc719dfd5c0fc9dfb06a74f1fae27b2788e2aba2b4df74de248ae869175606ed18d
-  data.tar.gz: 4985998170015c38fdd9b89c7d619068cfded34cf4e1dca77b65756459c1be4b931bc5fea6da3bec60172d2b46aae83a3aa00e138989f3a0c92653cda31277fc
+  metadata.gz: caa3b522f9fc732d72be3aeba84c891223545651c41a8b61a4144ddbb0f5fcbac0673b8c17460358cb058cee21130df1f8819a70e3fb99c6e04461cb1ee2bcd7
+  data.tar.gz: 38c9e593ded9496547dbdf4b3445dbd7b622b3a232ae7c833fb7d0689dc9625b15b857f45e9c2d1ca246ed5a3086ee0cbfa46463794a9f61889cba9fd24de4d2

data/README.md

@@ -3,7 +3,7 @@ rafka-rb: Ruby driver for Rafka
 [![Gem Version](https://badge.fury.io/rb/rafka.svg)](https://badge.fury.io/rb/rafka-rb)
 [![Documentation](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/github/skroutz/rafka-rb)
 
-Rafka is a thin Ruby client library for [Rafka](https://github.com/skroutz/rafka-rb),
+Rafka is a thin Ruby client library for [Rafka](https://github.com/skroutz/rafka),
 providing a consumer and a producer with simple semantics. It is backed by
 [redis-rb](https://github.com/redis/redis-rb).
 

data/lib/rafka.rb

@@ -12,7 +12,7 @@ module Rafka
   DEFAULTS = {
     host: "localhost",
     port: 6380,
-    reconnect_attempts: 0,
+    reconnect_attempts: 5,
   }
 
   def self.wrap_errors
@@ -27,5 +27,29 @@ module Rafka
       raise CommandError, e.message
     end
   end
+
+  # redis-rb until 3.2.1 didn't retry to connect on
+  # Redis::CannotConnectError (eg. when rafka is down) so we manually retry
+  # 5 times
+  #
+  # TODO(agis): get rid of this method when we go to 3.2.1 or later, because
+  # https://github.com/redis/redis-rb/pull/476/
+  def self.with_retry(times: DEFAULTS[:reconnect_attempts], every_sec: 1)
+    attempts = 0
+
+    begin
+      yield
+    rescue Redis::CannotConnectError => e
+      if Gem::Version.new(Redis::VERSION) < Gem::Version.new("3.2.2")
+        if attempts < times
+          attempts += 1
+          sleep every_sec
+          retry
+        end
+      end
+
+      raise e
+    end
+  end
 end
 

data/lib/rafka/consumer.rb

@@ -35,19 +35,41 @@ module Rafka
     # @example
     #   consume(5) { |msg| puts "I received #{msg.value}" }
     def consume(timeout=5)
-      # in 3.2.2 and later this is done automatically
+      # redis-rb didn't automatically call `CLIENT SETNAME` until v3.2.2
+      # (https://github.com/redis/redis-rb/issues/510)
       #
-      # @see https://github.com/redis/redis-rb/issues/510
-      if !@connected && Gem::Version.new(Redis::VERSION) < Gem::Version.new("3.2.2")
-        @redis.client.call([:client, :setname, @redis.id])
-        @connected = true
+      # TODO(agis): get rid of this when we drop support for 3.2.1 and before
+      if !@redis.client.connected? && Gem::Version.new(Redis::VERSION) < Gem::Version.new("3.2.2")
+        Rafka.wrap_errors do
+          @redis.client.call([:client, :setname, @redis.id])
+        end
       end
 
       raised = false
       msg = nil
+      setname_attempts = 0
+
+      begin
+        Rafka.wrap_errors do
+          Rafka.with_retry do
+            msg = @redis.blpop(@topic, timeout: timeout)
+          end
+        end
+      rescue ConsumeError => e
+        # redis-rb didn't automatically call `CLIENT SETNAME` until v3.2.2
+        # (https://github.com/redis/redis-rb/issues/510)
+        #
+        # this is in case the server restarts while we were performing a BLPOP
+        #
+        # TODO(agis): get rid of this when we drop support for 3.2.1 and before
+        if e.message =~ /Identify yourself/ && setname_attempts < 5
+          sleep 0.5
+          @redis.client.call([:client, :setname, @redis.id])
+          setname_attempts += 1
+          retry
+        end
 
-      Rafka.wrap_errors do
-        msg = @redis.blpop(@topic, timeout: timeout)
+        raise e
       end
 
       return if !msg

data/lib/rafka/version.rb

@@ -1,3 +1,3 @@
 module Rafka
-  VERSION = "0.0.6".freeze
+  VERSION = "0.0.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rafka
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Agis Anastasopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis