rafka 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5fe0a43fb774aaebab5f1b5d5a107aa6f0e3a6d
-  data.tar.gz: 53aab986230eccc406cae3d4a3cc5b1b16e7543e
+  metadata.gz: 28f4bb6a0680cce617d517bf528b575cbb389c25
+  data.tar.gz: 0a17d24c5183175436d58c8e35dad93f752ec91b
 SHA512:
-  metadata.gz: bdc9980b82e023297b15ee640001b15b45ee40b5de13aaf34f9668aa21deafbc50272dd22e03ed576f41b90f292b14f142a4d5f90be09014023e34fe4058de37
-  data.tar.gz: b10af1968c2541c0e198346d7a97d561de2e869363f15ce01526f08ec1bdf5543b7f29b6439586faef998e031e9f2107164c70bf028f8d6a9200fa0042c52aa6
+  metadata.gz: 3197247d5b810b717bb7038c04ad3fd39eb63b7319f48d41f8c5eaa73d30d632d23312c2b795bc122ff1626c6c80395810fb47042ebd238d542b47b2e1d47382
+  data.tar.gz: 6200c187acaf499eb24ccc66b29e7c3185efa5784a81a88c6d7a892854ed6245665d27ca5b9c50ccfe6ee13b53107724e7188a25c2b2a7dbf1962812b791a797

data/CHANGELOG.md

@@ -9,7 +9,17 @@ Breaking changes are prefixed with a "[BREAKING]" label.
 
 
 
-## 0.3.0 (2018-06-07)
+## 0.4.0 (2018-09-04)
+
+### Changed
+
+- [BREAKING] Depend on redis-rb 3.3.2 or later [[#15](https://github.com/skroutz/rafka-rb/pull/15)]
+- [BREAKING] `reconnect_attempts` option now defaults to `1` (ie. no reconnects) [[#15](https://github.com/skroutz/rafka-rb/pull/15)]
+
+
+
+
+
 
 ### Added
 

data/lib/rafka.rb

@@ -11,8 +11,7 @@ require "rafka/producer"
 module Rafka
   REDIS_DEFAULTS = {
     host: "localhost",
-    port: 6380,
-    reconnect_attempts: 5
+    port: 6380
   }.freeze
 
   def self.wrap_errors
@@ -22,28 +21,4 @@ module Rafka
     raise ConsumeError, e.message[5..-1] if e.message.start_with?("CONS ")
     raise CommandError, e.message
   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: REDIS_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

@@ -77,14 +77,6 @@ module Rafka
     # @example Consume a message and commit offset if the block does not raise an exception
     #   consumer.consume { |msg| puts "I received #{msg.value}" }
     def consume(timeout=5)
-      # redis-rb didn't automatically call `CLIENT SETNAME` until v3.2.2
-      # (https://github.com/redis/redis-rb/issues/510)
-      #
-      # 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")
-        set_name!
-      end
-
       raised = false
       msg = consume_one(timeout)
 
@@ -145,14 +137,6 @@ module Rafka
         raise ArgumentError, "one of batch_size or batching_max_sec must be greater than 0"
       end
 
-      # redis-rb didn't automatically call `CLIENT SETNAME` until v3.2.2
-      # (https://github.com/redis/redis-rb/issues/510)
-      #
-      # 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")
-        set_name!
-      end
-
       raised = false
       start_time = Time.now
       msgs = []
@@ -246,12 +230,6 @@ module Rafka
       tp
     end
 
-    def set_name!
-      Rafka.wrap_errors do
-        @redis.client.call([:client, :setname, @redis.id])
-      end
-    end
-
     # @param timeout [Fixnum]
     #
     # @raise [MalformedMessageError]
@@ -259,29 +237,9 @@ module Rafka
     # @return [nil, Message]
     def consume_one(timeout)
       msg = nil
-      setname_attempts = 0
 
-      begin
-        Rafka.wrap_errors do
-          Rafka.with_retry(times: @redis_opts[:reconnect_attempts]) do
-            msg = @redis.blpop(@blpop_arg, 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
-          set_name!
-          setname_attempts += 1
-          retry
-        end
-
-        raise e
+      Rafka.wrap_errors do
+        msg = @redis.blpop(@blpop_arg, timeout: timeout)
       end
 
       msg = Message.new(msg) if msg

data/lib/rafka/producer.rb

@@ -40,11 +40,9 @@ module Rafka
     #     produce("greetings", "Hola", key: "abc")
     def produce(topic, msg, key: nil)
       Rafka.wrap_errors do
-        Rafka.with_retry(times: @options[:reconnect_attempts]) do
-          redis_key = "topics:#{topic}"
-          redis_key << ":#{key}" if key
-          @redis.rpushx(redis_key, msg.to_s)
-        end
+        redis_key = "topics:#{topic}"
+        redis_key << ":#{key}" if key
+        @redis.rpushx(redis_key, msg.to_s)
       end
     end
 

data/lib/rafka/version.rb

@@ -1,3 +1,3 @@
 module Rafka
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

data/test/consumer_test.rb

@@ -64,6 +64,9 @@ class ConsumerTest < Minitest::Test
     cons = Rafka::Consumer.new(group: "foo", topic: "bar", librdkafka: {})
     assert_equal cons.blpop_arg, "topics:bar"
 
+    cons = Rafka::Consumer.new(group: "foo", topic: "bar", librdkafka: nil)
+    assert_equal cons.blpop_arg, "topics:bar"
+
     cons = Rafka::Consumer.new(group: "foo", topic: "bar")
     assert_equal cons.blpop_arg, "topics:bar"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rafka
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Agis Anastasopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement