bunny 2.14.3 → 2.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c29f135d76d09fb4260a945a620a80d281b5194ea55bdd9e4fd1f43b9e849544
-  data.tar.gz: 23ff6197091a0d373fbad760dba33ec199bbacd85d274f4a828afd8d78b2d28c
+  metadata.gz: cf0bcb6bc92f6092788f0eeffed76f438be49f1341857a6e5a94254544cf44e3
+  data.tar.gz: 317240a20f888087e959999b7cbe10d57fe423316032bc6fa6f2a6733e8dd50c
 SHA512:
-  metadata.gz: 4c73f2103a2c7ab9df2ae497592e37c5d28c2e92ff2e8833337375859aa7eb08082952cf1314762df9fe3599b4fb958050ea4242d13c8cf4283ce0cf4bfa0315
-  data.tar.gz: 3ab49bec79e0bbacd7e06d3e9d84b0dbb3a3dac0c3cbbf131a96b51c1c6c5fdd50b2cc85d94a5f8bbc9440f6a4a976cdc6e3669d1c1ccf49639f976156cafb50
+  metadata.gz: d0c159c08871fdf203a322543489d9c563d45c855f407f9e069adc6f3f0d97f7b0fb8d7ac90a5280dfdc2cea81dbef53e0c2b217be2064373432d0ca0d889626
+  data.tar.gz: 4d8a071b4d8494ad3976d842a705cf3d8323d8c14c61a0c147c309cc07ebc77bf6420243a597c68a3cde9b4b7a6cb5f17e25bab7972cf607f1d1d55b8bd88cdb

data/.travis.yml

@@ -1,3 +1,4 @@
+dist: bionic
 language: ruby
 bundler_args: --without development
 cache: bundler
@@ -10,10 +11,10 @@ before_script:
 script: "bundle exec rake integration_without_recovery"
 rvm:
   - ruby-head
-  - "2.6.0"
-  - "2.5.1"
-  - "2.4.2"
-  - "2.3.5"
+  - "2.6.3"
+  - "2.5.5"
+  - "2.4.5"
+  - "2.3.8"
 notifications:
   email: michael@rabbitmq.com
 services:

data/ChangeLog.md

@@ -1,6 +1,25 @@
-## Changes between Bunny 2.14.3 and 2.14.4 (in development)
+## Changes between Bunny 2.14.4 and 2.14.5 (in development)
 
-No changes yet.
+No changes.
+
+
+## Changes between Bunny 2.14.3 and 2.14.4 (Feb 11th, 2020)
+
+### More Defensive Thread Join Operations
+
+Bunny is now more defensive around thread join operations which it performs
+when stopping its consumer work pool.
+
+`Thread#join` can cause an unhandled exception to be re-raised at
+a very surprising moment. This behavior can also be affected by 3rd party
+libraries, e.g. those that do connection pooling. While Bunny cannot
+fully avoid every possible surprising failure, it now avoids at least
+one such problematic interaction triggered by a custom [interrupt handler](https://ruby-doc.org/core-2.5.1/Thread.html#method-c-handle_interrupt)
+in a 3rd party library.
+
+GitHub issue: [#589](https://github.com/ruby-amqp/bunny/issues/589)
+
+Contributed by @fuegas.
 
 
 ## Changes between Bunny 2.14.2 and 2.14.3 (Sep 29th, 2019)

data/README.md

@@ -48,7 +48,7 @@ Specific examples:
 
 Modern Bunny versions support
 
- * CRuby 2.2 through 2.5 (inclusive)
+ * CRuby 2.3 through 2.6 (inclusive)
 
 Bunny works sufficiently well on JRuby but there are known
 JRuby bugs in versions prior to JRuby 9000 that cause high CPU burn. JRuby users should

data/lib/bunny/cruby/socket.rb

@@ -32,6 +32,9 @@ module Bunny
         socket.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, true)
       end
       socket.setsockopt(::Socket::SOL_SOCKET, ::Socket::SO_KEEPALIVE, true) if options.fetch(:keepalive, true)
+      socket.instance_eval do
+        @__bunny_socket_eof_flag__ = false
+      end
       socket.extend self
       socket.options = { :host => host, :port => port }.merge(options)
       socket

data/lib/bunny/reader_loop.rb

@@ -116,7 +116,14 @@ module Bunny
     end
 
     def join
-      @thread.join if @thread
+      # Thread#join can/would trigger a re-raise of an unhandled exception in this thread.
+      # In addition, Thread.handle_interrupt can be used by other libraries or application code
+      # that would make this join operation fail with an obscure exception.
+      # So we try to save everyone some really unpleasant debugging time by introducing
+      # this condition which typically would not evaluate to true anyway.
+      #
+      # See ruby-amqp/bunny#589 and ruby-amqp/bunny#590 for background.
+      @thread.join if @thread && @thread != Thread.current
     end
 
     def kill

data/lib/bunny/session.rb

@@ -171,6 +171,7 @@ module Bunny
                                else
                                  opts[:automatically_recover] || opts[:automatic_recovery]
                                end
+      @recovering_from_network_failure = false
       @max_recovery_attempts = opts[:recovery_attempts]
       @recovery_attempts     = @max_recovery_attempts
       # When this is set, connection attempts won't be reset after
@@ -184,6 +185,7 @@ module Bunny
       @continuation_timeout   = opts.fetch(:continuation_timeout, DEFAULT_CONTINUATION_TIMEOUT)
 
       @status             = :not_connected
+      @manually_closed    = false
       @blocked            = false
 
       # these are negotiated with the broker during the connection tuning phase

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "2.14.3"
+  VERSION = "2.14.4"
 end

data/repl

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-bundle exec ripl -Ilib -r'bunny' -r'ripl/multi_line' -r'ripl/irb'
+bundle exec ruby -w `which ripl` -Ilib -r'bunny' -r'ripl/multi_line' -r'ripl/irb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.14.3
+  version: 2.14.4
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-29 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol