bunny 2.24.0 → 3.1.0

data/lib/bunny/transport.rb

@@ -72,7 +72,7 @@ module Bunny
       @read_timeout = opts[:read_timeout] || DEFAULT_READ_TIMEOUT
       @read_timeout = nil if @read_timeout == 0
 
-      @write_timeout = opts[:socket_timeout] # Backwards compatability
+      @write_timeout = opts[:socket_timeout] # Backwards compatibility
 
       @write_timeout ||= opts[:write_timeout] || DEFAULT_WRITE_TIMEOUT
       @write_timeout = nil if @write_timeout == 0
@@ -180,8 +180,10 @@ module Bunny
     # Writes data to the socket without timeout checks
     def write_without_timeout(data, raise_exceptions = false)
       begin
-        @writes_mutex.synchronize { @socket.write(data) }
-        @socket.flush
+        @writes_mutex.synchronize do
+          @socket.write(data)
+          @socket.flush
+        end
       rescue SystemCallError, Bunny::ConnectionError, IOError => e
         close
         raise e if raise_exceptions
@@ -200,7 +202,7 @@ module Bunny
     # @private
     def send_frame(frame)
       if closed?
-        @session.handle_network_failure(ConnectionClosedError.new(frame))
+        @session.handle_network_failure(ConnectionClosedError.new(frame)) if @session.automatically_recover?
       else
         write(frame.encode)
       end
@@ -212,7 +214,7 @@ module Bunny
     # @private
     def send_frame_without_timeout(frame)
       if closed?
-        @session.handle_network_failure(ConnectionClosedError.new(frame))
+        @session.handle_network_failure(ConnectionClosedError.new(frame)) if @session.automatically_recover?
       else
         write_without_timeout(frame.encode)
       end
@@ -259,7 +261,10 @@ module Bunny
     # Exposed primarily for Bunny::Channel
     # @private
     def read_next_frame(opts = {})
-      header              = read_fully(7)
+      @frame_header_buffer ||= String.new(capacity: 7)
+      @frame_header_buffer.clear
+      header = read_fully_into(@frame_header_buffer, 7)
+
       type, channel, size = AMQ::Protocol::Frame.decode_header(header)
       payload             = if size > 0
                               read_fully(size)
@@ -278,8 +283,26 @@ module Bunny
       AMQ::Protocol::Frame.new(type, payload, channel)
     end
 
+    # @private
+    def read_fully_into(buffer, count)
+      begin
+        @socket.read_fully_into(buffer, count, @read_timeout)
+      rescue SystemCallError, Timeout::Error, Bunny::ConnectionError, IOError => e
+        @logger.error "Got an exception when receiving data: #{e.message} (#{e.class.name})"
+        close
+        @status = :not_connected
 
-    def self.reacheable?(host, port, timeout)
+        if @session.automatically_recover?
+          raise
+        else
+          @session_error_handler.raise(Bunny::NetworkFailure.new("detected a network failure: #{e.message}", e))
+        end
+      end
+      buffer
+    end
+
+
+    def self.reachable?(host, port, timeout)
       begin
         s = Bunny::SocketImpl.open(host, port,
           :connect_timeout => timeout)
@@ -292,12 +315,16 @@ module Bunny
       end
     end
 
+    class << self
+      alias_method :reacheable?, :reachable?
+    end
+
     def self.ping!(host, port, timeout)
-      raise ConnectionTimeout.new("#{host}:#{port} is unreachable") if !reacheable?(host, port, timeout)
+      raise ConnectionTimeout.new("#{host}:#{port} is unreachable") if !reachable?(host, port, timeout)
     end
 
     def initialize_socket
-      @logger.debug("Usong connection timeout of #{@connect_timeout} when connecting to #{@host}:#{@port}")
+      @logger.debug("Using connection timeout of #{@connect_timeout} when connecting to #{@host}:#{@port}")
       begin
         @socket = Bunny::SocketImpl.open(@host, @port,
           :keepalive      => @opts[:keepalive],

data/lib/bunny/version.rb

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

data/lib/bunny.rb

@@ -89,7 +89,7 @@ module Bunny
   # @option connection_string_or_opts [Proc] :recovery_attempt_started (nil) Will be called before every connection recovery attempt
   # @option connection_string_or_opts [Proc] :recovery_completed (nil) Will be called after successful connection recovery
   # @option connection_string_or_opts [Boolean] :recover_from_connection_close (true) Should this connection recover after receiving a server-sent connection.close (e.g. connection was force closed)?
-  # @option connection_string_or_opts [Object] :session_error_handler (Thread.current) Object which responds to #raise that will act as a session error handler. Defaults to Thread.current, which will raise asynchronous exceptions in the thread that created the session.
+  # @option connection_string_or_opts [Object] :session_error_handler (ExceptionAccumulator.new) Object which responds to #raise that will act as a session error handler. Defaults to a Bunny::ExceptionAccumulator instance which stores exceptions for safe retrieval later. Can be set to Thread.current for legacy behavior (raises asynchronous exceptions in the creating thread).
   #
   # @option optz [String] :auth_mechanism ("PLAIN") Authentication mechanism, PLAIN or EXTERNAL
   # @option optz [String] :locale ("PLAIN") Locale RabbitMQ should use

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.24.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -11,7 +11,7 @@ authors:
 - Stefan Kaes
 bindir: bin
 cert_chain: []
-date: 2025-03-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -19,14 +19,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: sorted_set
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +87,7 @@ files:
 - lib/bunny/concurrent/atomic_fixnum.rb
 - lib/bunny/concurrent/condition.rb
 - lib/bunny/concurrent/continuation_queue.rb
+- lib/bunny/concurrent/exception_accumulator.rb
 - lib/bunny/concurrent/synchronized_sorted_set.rb
 - lib/bunny/consumer.rb
 - lib/bunny/consumer_tag_generator.rb
@@ -89,9 +110,10 @@ files:
 - lib/bunny/test_kit.rb
 - lib/bunny/timeout.rb
 - lib/bunny/timestamp.rb
+- lib/bunny/topology_recovery_filter.rb
+- lib/bunny/topology_registry.rb
 - lib/bunny/transport.rb
 - lib/bunny/version.rb
-- lib/bunny/versioned_delivery_tag.rb
 homepage: http://rubybunny.info
 licenses:
 - MIT
@@ -105,14 +127,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ
 test_files: []

data/lib/bunny/versioned_delivery_tag.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Bunny
-  # Wraps a delivery tag (which is an integer) so that {Bunny::Channel} could
-  # detect stale tags after connection recovery.
-  #
-  # @private
-  class VersionedDeliveryTag
-    attr_reader :tag
-    attr_reader :version
-
-    def initialize(tag, version)
-      raise ArgumentError.new("tag cannot be nil") unless tag
-      raise ArgumentError.new("version cannot be nil") unless version
-
-      @tag     = tag.to_i
-      @version = version.to_i
-    end
-
-    def to_i
-      @tag
-    end
-
-    def stale?(version)
-      raise ArgumentError.new("version cannot be nil") unless version
-
-      @version < version.to_i
-    end
-  end
-end