amqp 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a27af25790fbbfceee41b2ed96246b3e3736624a
-  data.tar.gz: 2dbac00d7f5e582cb91c6b6fa4ee4510fcceb8df
+  metadata.gz: 505c99ff4d142a7284d3b96a17efa6d284d1dcf0
+  data.tar.gz: c9c53b83f8a3aaac97723fdcb259da861843712a
 SHA512:
-  metadata.gz: 8f218bcdf94cd7e0a02a82717860c63d8476a7a48ab08c965a9639197d6cdb815a3fb18ca4c7ac4de73bd8ef78aae594b8cca4fd6c3c25ce59499ef2ee9acddf
-  data.tar.gz: 21df041f087ba88c6fd67f64c9a12869c411f48cdd270d9e16fe6578df5d80f7631094de05e7cc920bc9c9fdf7c5be07f6a0be55bdfe424b2aa432e3a04bc98b
+  metadata.gz: c739321a577b28bebaac53a7ae8f62926247113195b3af9be44f44df2a97e5f43e3ec9ef55faa398726d18664d918fbef73c214d75799b93e91f686eb1b77943
+  data.tar.gz: af3a458405c5961af2d974e46148d0ef86e7d396b467bc0a74de6fbd19fbc684cf4e75853888a5d0c1c3af50ae0b7a8b479c53a73867b0dbe25789e34d5e284c

data/ChangeLog.md

@@ -1,3 +1,13 @@
+## Changes Between 1.4.0 and 1.4.1
+
+### Server-Named Queue Recovery Fix
+
+Server-named queues are now correctly recovered again.
+
+Contributed by Jack C Hong.
+
+
+
 ## Changes Between 1.3.x and 1.4.0
 
 ### connection.blocked Support

data/examples/error_handling/automatically_recovering_hello_world_consumer.rb

@@ -12,7 +12,7 @@ puts "=> Example of automatic AMQP channel and queues recovery"
 puts
 AMQP.start(:host => ENV.fetch("BROKER_HOST", "localhost")) do |connection, open_ok|
   connection.on_error do |ch, connection_close|
-    raise connection_close.reply_text
+    puts "[connection closed] #{connection_close.reply_text}"
   end
 
   ch1 = AMQP::Channel.new(connection, :auto_recovery => true)

data/examples/error_handling/automatically_recovering_hello_world_consumer_that_uses_a_server_named_queue.rb

@@ -12,7 +12,7 @@ puts "=> Example of automatic AMQP channel and queues recovery"
 puts
 AMQP.start(:host => "localhost") do |connection, open_ok|
   connection.on_error do |ch, connection_close|
-    raise connection_close.reply_text
+    puts "[connection closed] #{connection_close.reply_text}"
   end
 
   ch1 = AMQP::Channel.new(connection, 2, :auto_recovery => true)

data/lib/amqp/queue.rb

@@ -354,43 +354,6 @@ module AMQP
     end
 
 
-    # @group Error Handling and Recovery
-
-    # Used by automatic recovery machinery.
-    # @private
-    # @api plugin
-    def rebind(&block)
-      @bindings.each { |b| self.bind(b[:exchange], b) }
-    end
-
-    # Called by associated connection object when AMQP connection has been re-established
-    # (for example, after a network failure).
-    #
-    # @api plugin
-    def auto_recover
-      self.exec_callback_yielding_self(:before_recovery)
-
-      if self.server_named?
-        old_name = @name.dup
-        @name    = AMQ::Protocol::EMPTY_STRING
-
-        @channel.queues.delete(old_name)
-      end
-
-      self.redeclare do
-        self.rebind
-
-        @consumers.each { |tag, consumer| consumer.auto_recover }
-
-        self.exec_callback_yielding_self(:after_recovery)
-      end
-    end # auto_recover
-
-    # @endgroup
-
-
-
-
     # Remove the binding between the queue and exchange. The queue will
     # not receive any more messages until it is bound to another
     # exchange.
@@ -1223,9 +1186,38 @@ module AMQP
 
 
 
-
     # @group Error Handling & Recovery
 
+    # Used by automatic recovery machinery.
+    # @private
+    # @api api
+    def rebind(&block)
+      @bindings.each { |b| self.bind(b[:exchange], b) }
+    end
+
+    # Called by associated connection object when AMQP connection has been re-established
+    # (for example, after a network failure).
+    #
+    # @api api
+    def auto_recover
+      self.exec_callback_yielding_self(:before_recovery)
+
+      if self.server_named?
+        old_name = @name.dup
+        @name    = AMQ::Protocol::EMPTY_STRING
+
+        @channel.queues.delete(old_name)
+      end
+
+      self.redeclare do
+        self.rebind
+
+        @consumers.each { |tag, consumer| consumer.auto_recover }
+
+        self.exec_callback_yielding_self(:after_recovery)
+      end
+    end # auto_recover
+
     # Defines a callback that will be executed after TCP connection is interrupted (typically because of a network failure).
     # Only one callback can be defined (the one defined last replaces previously added ones).
     #
@@ -1268,23 +1260,6 @@ module AMQP
       @consumers.each { |tag, c| c.run_after_recovery_callbacks }
     end
 
-
-
-    # Called by associated connection object when AMQP connection has been re-established
-    # (for example, after a network failure).
-    #
-    # @api plugin
-    def auto_recover
-      self.exec_callback_yielding_self(:before_recovery)
-      self.redeclare do
-        self.rebind
-
-        @consumers.each { |tag, consumer| consumer.auto_recover }
-
-        self.exec_callback_yielding_self(:after_recovery)
-      end
-    end # auto_recover
-
     # @endgroup
 
 

data/lib/amqp/version.rb

@@ -6,5 +6,5 @@ module AMQP
   #
   # @see AMQ::Protocol::VERSION
   # @return [String] AMQP gem version
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amqp
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Aman Gupta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine