bunny 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 420677d5395cc80a5ca3f5c553d9112ae947afb5d5dfef04f4d6ee95e3256b69
-  data.tar.gz: 1305a730a263123d1cdb1aef37725b4021ffd76a26b77166242ecfb3f12f65eb
+  metadata.gz: d7cc272154254919de29ea5437f5eb13c3bff2fd16b229f2fae0939982d1fe27
+  data.tar.gz: 19720fa046ac8c06ca6c7e4bb3b450979b8f9537ed8cec7c6747a26428f14a8b
 SHA512:
-  metadata.gz: '09f98c780d34e755191b9925517f724c1b3009c0de707899d86ad80a98732cc09cbb83f00a4e3bf7c68c9c8e481da21e9ae5c204fbb2c22790f1c70317b01840'
-  data.tar.gz: 48c53d2fc69c737d1580e216df84273f18fff9018bdd6355dc439cf837a4f22998dc383088c84bae57eebf1c5476b08b8c7a21fb6fef2dd01c9eec0c4a7b9d63
+  metadata.gz: 1e604aa9511aac55434c1b458fab2ab67bb5cc454f3d8c2ada5bd910db20cb18c7382332e28e5b55d88478f7587688c80272063020ac2549fe37ee8902fade70
+  data.tar.gz: 182b111def73c1d0c25c6e4444a884703189ba7ba99c0bc39ba1db148f52210754a0da98f38ff161738db3dd647bbae5d3d78ba56dfaa6c54172803692fc58b7

data/README.md

@@ -123,7 +123,9 @@ conn.start
 
 # open a channel
 ch = conn.create_channel
-ch.confirm_select
+# enable publisher confirms with automatic tracking,
+# see https://www.rabbitmq.com/docs/publishers#data-safety
+ch.confirm_select(tracking: true)
 
 # declare a queue
 q  = ch.queue("test1")
@@ -136,10 +138,6 @@ end
 # publish a message to the default exchange which then gets routed to this queue
 q.publish("Hello, everybody!")
 
-# await confirmations from RabbitMQ, see
-# https://www.rabbitmq.com/publishers.html#data-safety for details
-ch.wait_for_confirms
-
 # give the above consumer some time consume the delivery and print out the message
 sleep 1
 

data/lib/bunny/channel.rb

@@ -339,6 +339,21 @@ module Bunny
       @status == :closed
     end
 
+    # @private
+    def connection_closed!
+      @status = :closed
+    end
+
+    # @private
+    def recovering!
+      @status = :recovering
+    end
+
+    # @private
+    def recovery_completed!
+      @status = :open
+    end
+
     #
     # @group Backwards compatibility with 0.8.0
     #
@@ -2250,7 +2265,9 @@ module Bunny
 
         # basic.ack, basic.reject, basic.nack. MK.
         if channel_level_exception_after_operation_that_has_no_response?(method)
-          @on_error.call(self, method) if @on_error
+          # Runs outside the reader loop so that the callback can perform
+          # blocking operations such as channel.reopen.
+          Thread.new { @on_error.call(self, method) } if @on_error
         else
           @last_channel_error = instantiate_channel_level_exception(method)
           @continuations.push(method)

data/lib/bunny/session.rb

@@ -817,6 +817,7 @@ module Bunny
             announce_network_failure_recovery
             @channel_mutex.synchronize do
               @channels.each do |n, ch|
+                ch.connection_closed!
                 ch.maybe_kill_consumer_work_pool!
               end
             end
@@ -825,6 +826,7 @@ module Bunny
 
             recover_connection_and_channels
             recover_topology
+            mark_channels_after_recovery!
             notify_of_recovery_completion
           else
             @logger.error "Exception #{exception.message} is considered unrecoverable..."
@@ -1048,11 +1050,21 @@ module Bunny
       @channel_mutex.synchronize do
         @channels.each do |n, ch|
           ch.open
+          ch.recovering!
           ch.recover_from_network_failure
         end
       end
     end
 
+    # @private
+    def mark_channels_after_recovery!
+      @channel_mutex.synchronize do
+        @channels.each do |n, ch|
+          ch.recovery_completed!
+        end
+      end
+    end
+
     # @private
     def recover_topology
       @logger.debug "Will recover topology now"

data/lib/bunny/version.rb

@@ -3,5 +3,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="