rafka 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f0c9ae88643e805addf746e68767a2c134f102
-  data.tar.gz: 06fa59ddd4abe76902128f602c2d778e692bfc28
+  metadata.gz: af039ada3c68e5b6a3478a84942b344bc9a229f0
+  data.tar.gz: 6f0e9cc0c464b83e0661cd868f4c3d94f00217cb
 SHA512:
-  metadata.gz: 9d348163af1c40fce64ca9a13ec579bc09f144540823d7f49a3831dca811e28815edda74bb92c3681832b4050cd5283eccd244c26df9c9229da41d8f60a1b42d
-  data.tar.gz: 923c97c2f33fcbba4a929154923f0801c1b426dff03a4ac3776b007f1c18129edfe02b171580adf69b3bdc4cfe1b2bf403d41ac4329474551b977178127d2fc7
+  metadata.gz: '0817ecf06bf5fbd36852f19d98b317ecf56aa9cf3e052db3bd75e22174c609b3be2541f145dccbc6640e82ebb7247245b75d24561ddfd27e3a1d2c05f4f746a8'
+  data.tar.gz: 40bff0316776a450b8e77b5c4cce5364d9fe93cd237cc7ae9c296e198470908616cdba392dbb5aa9dd093eaeeae3096017614f2037adf98bbdeff77a7406aa18

data/CHANGELOG.md

@@ -5,6 +5,12 @@ Breaking changes are prefixed with a "[BREAKING]" label.
 ## master (unreleased)
 
 
+## 0.2.2 (2018-05-04)
+
+### Fixed
+
+- SETNAME was incorrectly called more than once in batch mode [[3416d7](https://github.com/skroutz/rafka-rb/commit/3416d7bbd9f9e36b4e4d7f87f1e51ba2f559caf2))
+
 ## 0.2.1 (2018-05-04)
 
 ### Fixed

data/README.md

@@ -1,7 +1,7 @@
 rafka-rb
 ===============================================================================
 [![Build Status](https://api.travis-ci.org/skroutz/rafka-rb.svg?branch=master)](https://travis-ci.org/skroutz/rafka-rb)
-[![Gem Version](https://badge.fury.io/rb/rafka.svg)](https://badge.fury.io/rb/rafka-rb)
+[![Gem Version](https://badge.fury.io/rb/rafka.svg)](https://badge.fury.io/rb/rafka)
 [![Documentation](http://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/github/skroutz/rafka-rb)
 
 rafka-rb is a Ruby client library for [Rafka](https://github.com/skroutz/rafka).

data/lib/rafka/consumer.rb

@@ -67,14 +67,21 @@ 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)
-      set_name!
-      raised = false
-      msg = consume_one(timeout)
+      # 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
 
-      return nil if !msg
+      raised = false
 
       begin
+        msg = consume_one(timeout)
         yield(msg) if block_given?
+
+        return nil if !msg
       rescue => e
         raised = true
         raise e
@@ -128,7 +135,14 @@ module Rafka
         raise ArgumentError, "one of batch_size or batching_max_sec must be greater than 0"
       end
 
-      set_name!
+      # 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 = []
@@ -222,13 +236,7 @@ module Rafka
       tp
     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
     def set_name!
-      return 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
@@ -258,7 +266,7 @@ module Rafka
         # 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])
+          set_name!
           setname_attempts += 1
           retry
         end

data/lib/rafka/version.rb

@@ -1,3 +1,3 @@
 module Rafka
-  VERSION = "0.2.1".freeze
+  VERSION = "0.2.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rafka
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Agis Anastasopoulos