bunny 2.23.0 → 3.0.0

data/lib/bunny/queue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bunny/get_response"
 
 module Bunny
@@ -15,8 +17,10 @@ module Bunny
       QUORUM  = "quorum"
       CLASSIC = "classic"
       STREAM  = "stream"
+      DELAYED = "delayed"
+      JMS     = "jms"
 
-      KNOWN = [CLASSIC, QUORUM, STREAM]
+      KNOWN = [CLASSIC, QUORUM, STREAM, DELAYED, JMS]
 
       def self.known?(q_type)
         KNOWN.include?(q_type)
@@ -26,6 +30,13 @@ module Bunny
     module XArgs
       MAX_LENGTH = "x-max-length",
       QUEUE_TYPE = "x-queue-type"
+
+      DELAYED_RETRY_TYPE = "x-delayed-retry-type"
+      DELAYED_RETRY_MIN  = "x-delayed-retry-min"
+      DELAYED_RETRY_MAX  = "x-delayed-retry-max"
+
+      SELECTOR_FIELDS          = "x-selector-fields"
+      SELECTOR_FIELD_MAX_BYTES = "x-selector-field-max-bytes"
     end
 
     # @return [Bunny::Channel] Channel this queue uses
@@ -42,7 +53,7 @@ module Bunny
     # @option opts [Boolean] :durable (false)      Should this queue be durable?
     # @option opts [Boolean] :auto_delete (false)  Should this queue be automatically deleted when the last consumer disconnects?
     # @option opts [Boolean] :exclusive (false)    Should this queue be exclusive (only can be used by this connection, removed when the connection is closed)?
-    # @option opts [String] :type (nil)            Type of the declared queue (classic, quorum or stream)
+    # @option opts [String] :type (nil)            Type of the declared queue (classic, quorum, stream, delayed, or jms)
     # @option opts [Hash] :arguments (nil)         Additional optional arguments (typically used by RabbitMQ extensions and plugins)
     #
     # @see Bunny::Channel#queue
@@ -78,7 +89,10 @@ module Bunny
 
       declare! unless opts[:no_declare]
 
+      # for basic.deliver dispatch and such
       @channel.register_queue(self)
+      # for topology recovery
+      @channel.record_queue(self)
     end
 
     # @return [Boolean] true if this queue was declared as durable (will survive broker restart).
@@ -115,6 +129,13 @@ module Bunny
       @arguments
     end
 
+    # @param value [String]
+    # @private
+    def update_name_to(value)
+      @name = value
+      self
+    end
+
     def to_s
       oid = ("0x%x" % (self.object_id << 1))
       "<#{self.class.name}:#{oid} @name=\"#{name}\" channel=#{@channel.to_s} @durable=#{@durable} @auto_delete=#{@auto_delete} @exclusive=#{@exclusive} @arguments=#{@arguments}>"
@@ -318,6 +339,7 @@ module Bunny
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
     # @api public
     def delete(opts = {})
+      @channel.delete_recorded_queue_named(self.name)
       @channel.deregister_queue(self)
       @channel.queue_delete(@name, opts)
     end
@@ -352,42 +374,14 @@ module Bunny
       s[:consumer_count]
     end
 
-    #
-    # Recovery
-    #
-
-    # @private
-    def recover_from_network_failure
-      if self.server_named?
-        old_name = @name.dup
-        @name    = AMQ::Protocol::EMPTY_STRING
-
-        @channel.deregister_queue_named(old_name)
-      end
-
-      # TODO: inject and use logger
-      # puts "Recovering queue #{@name}"
-      begin
-        declare! unless @options[:no_declare]
-
-        @channel.register_queue(self)
-      rescue Exception => e
-        # TODO: inject and use logger
-        puts "Caught #{e.inspect} while redeclaring and registering #{@name}!"
-      end
-      recover_bindings
-    end
-
-    # @private
-    def recover_bindings
-      @bindings.each do |b|
-        # TODO: inject and use logger
-        # puts "Recovering binding #{b.inspect}"
-        self.bind(b[:exchange], b)
-      end
+    def self.verify_type!(args0 = {})
+      # be extra defensive
+      args = args0 || {}
+      q_type = args["x-queue-type"] || args[:"x-queue-type"]
+      throw ArgumentError.new(
+        "unsupported queue type #{q_type.inspect}, supported ones: #{Types::KNOWN.join(', ')}") if (q_type and !Types.known?(q_type))
     end
 
-
     #
     # Implementation
     #
@@ -419,9 +413,7 @@ module Bunny
     end
 
     def verify_type!(args)
-      q_type = (args || {})["x-queue-type"]
-      throw ArgumentError.new(
-        "unsupported queue type #{q_type.inspect}, supported ones: #{Types::KNOWN.join(', ')}") if (q_type and !Types.known?(q_type))
+      self.class.verify_type!(args)
     end
   end
 end

data/lib/bunny/reader_loop.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "thread"
 
 module Bunny
@@ -41,9 +43,13 @@ module Bunny
                OpenSSL::OpenSSLError => e
           break if terminate? || @session.closing? || @session.closed?
 
-          @network_is_down = true
+          @mutex.synchronize do
+            @stopping = true
+            @network_is_down = true
+          end
+
           if @session.automatically_recover?
-            log_exception(e, level: :warn)
+            log_exception(e, level: :debug)
             @session.handle_network_failure(e)
           else
             log_exception(e)
@@ -60,10 +66,6 @@ module Bunny
             @network_is_down = true
             @session_error_handler.raise(Bunny::NetworkFailure.new("caught an unexpected exception in the network loop: #{e.message}", e))
           end
-        rescue Errno::EBADF => _ebadf
-          break if terminate?
-          # ignored, happens when we loop after the transport has already been closed
-          @mutex.synchronize { @stopping = true }
         end
       end
 
@@ -76,7 +78,7 @@ module Bunny
 
       if !frame.final? || frame.method_class.has_content?
         header   = @transport.read_next_frame
-        content  = ''
+        content  = +''
 
         if header.body_size > 0
           loop do

data/lib/bunny/return_info.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Bunny
   # Wraps AMQ::Protocol::Basic::Return to
-  # provide access to the delivery properties as immutable hash as
-  # well as methods.
+  # provide access to the return properties as immutable hash as
+  # well as methods. Hash representation is created lazily.
   class ReturnInfo
 
     #
@@ -16,29 +18,34 @@ module Bunny
 
     def initialize(basic_return)
       @basic_return = basic_return
-      @hash          = {
-        :reply_code   => basic_return.reply_code,
-        :reply_text   => basic_return.reply_text,
-        :exchange     => basic_return.exchange,
-        :routing_key  => basic_return.routing_key
-      }
     end
 
     # Iterates over the returned delivery properties
     # @see Enumerable#each
     def each(*args, &block)
-      @hash.each(*args, &block)
+      to_hash.each(*args, &block)
     end
 
     # Accesses returned delivery properties by key
     # @see Hash#[]
     def [](k)
-      @hash[k]
+      case k
+      when :reply_code  then @basic_return.reply_code
+      when :reply_text  then @basic_return.reply_text
+      when :exchange    then @basic_return.exchange
+      when :routing_key then @basic_return.routing_key
+      else nil
+      end
     end
 
     # @return [Hash] Hash representation of this returned delivery info
     def to_hash
-      @hash
+      @hash ||= {
+        :reply_code   => @basic_return.reply_code,
+        :reply_text   => @basic_return.reply_text,
+        :exchange     => @basic_return.exchange,
+        :routing_key  => @basic_return.routing_key
+      }
     end
 
     # @private