ruby-kafka 0.5.0.beta4 → 0.5.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a79f7b7fd4484721c6ec49e2f43ddde653fe512
-  data.tar.gz: ab46aedab7380f46ae94d643b2c120e4b77d2f40
+  metadata.gz: '049f2fa2e6a04ff652cffe3ed630dbfe69e87009'
+  data.tar.gz: ed051c1dbb21aaac9360e58c74fca58d7706a76a
 SHA512:
-  metadata.gz: d94eab42cfda6905b8b694ea1dfab99b5cf272771c08dab81db32c334816f0aee3f751f0c28c32f029f6401175ae86636114f62f5867a06c9eca479ad309aec5
-  data.tar.gz: f0b9e5b9ccb765dbca5df8b43aa39d1fe39a624e6172f80cd81f0ceb5acb6616be99df2f334f2a19070147199d74397fc8d0d7bc76c999c3258f373ae210c0d4
+  metadata.gz: '08b01eb42a5082deac74cd5ff3136aa50ec16ac34c5ec4818d5a3722b9b46273b3601bd355073d3165c8917a9daf51356a43ff5ec97eceedbfcc6e0450018b79'
+  data.tar.gz: 16114b7e4abe72d82f3ae37cc0cfba4cbfdf798073adc04f1eaea892ac64eed2d96b66f093df1e2b3f1c6ac40f7a5b87146efadbed888d46a32abc4113e1f289

data/CHANGELOG.md

@@ -9,6 +9,7 @@ Changes and additions to the library will be listed here.
 - Drops support for Kafka 0.9 in favor of Kafka 0.10 (#381)!
 - Handle cases where there are no partitions to fetch from by sleeping a bit (#439).
 - Handle problems with the broker cache (#440).
+- Shut down more quickly (#438).
 
 ## v0.4.3
 

data/lib/kafka/connection.rb

@@ -109,7 +109,7 @@ module Kafka
 
         response
       end
-    rescue Errno::EPIPE, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
+    rescue Errno::EPIPE, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ESHUTDOWN, EOFError => e
       close
 
       raise ConnectionError, "Connection error: #{e}"

data/lib/kafka/consumer.rb

@@ -94,6 +94,7 @@ module Kafka
     # @return [nil]
     def stop
       @running = false
+      @cluster.disconnect
     end
 
     # Pause processing of a specific topic partition.

data/lib/kafka/fetched_message.rb

@@ -19,7 +19,7 @@ module Kafka
     # @return [Time] the timestamp of the message.
     attr_reader :create_time
 
-    def initialize(value:, key:, topic:, partition:, offset:, create_time:)
+    def initialize(value: nil, key: nil, topic:, partition:, offset:, create_time: nil)
       @value = value
       @key = key
       @topic = topic

data/lib/kafka/socket_with_timeout.rb

@@ -24,6 +24,9 @@ module Kafka
 
       @timeout = timeout
 
+      # This pipe is used to cancel IO.select calls when sockets are closed.
+      @cancel_reader, @cancel_writer = IO.pipe
+
       @socket = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
       @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
 
@@ -57,11 +60,20 @@ module Kafka
     # @raise [Errno::ETIMEDOUT] if the timeout is exceeded.
     # @return [String] the data that was read from the socket.
     def read(num_bytes)
-      unless IO.select([@socket], nil, nil, @timeout)
-        raise Errno::ETIMEDOUT
-      end
+      rs, _, _ = IO.select([@socket, @cancel_reader], nil, nil, @timeout)
+
+      # The read timed out.
+      raise Errno::ETIMEDOUT if rs.nil?
+
+      # The socket has been closed.
+      raise Errno::ECONNABORTED if rs.include?(@cancel_reader)
 
       @socket.read(num_bytes)
+    rescue Errno::EBADF
+      # We'll get EBADF if `select` is called with a closed socket, or
+      # if it's closed in the middle of things.
+      raise Errno::ESHUTDOWN if @socket.closed?
+      raise
     rescue IO::EAGAINWaitReadable
       retry
     end
@@ -80,6 +92,7 @@ module Kafka
     end
 
     def close
+      @cancel_writer.puts
       @socket.close
     end
 

data/lib/kafka/version.rb

@@ -1,3 +1,3 @@
 module Kafka
-  VERSION = "0.5.0.beta4"
+  VERSION = "0.5.0.beta5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-kafka
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta4
+  version: 0.5.0.beta5
 platform: ruby
 authors:
 - Daniel Schierbeck