march_hare 2.4.0-java → 2.5.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82c92c56c3adf263af23af587c70d5ce91d3b171
-  data.tar.gz: 0298791f0deeeab7b0c02b3594677f3041fb0114
+  metadata.gz: 73b8a86e921a22e112e007dbf65cedf99ac93bfc
+  data.tar.gz: 147ad313b6744b8b7b1a37991817221d7bdff723
 SHA512:
-  metadata.gz: 7003b472edb275a6ab1e5251a5a70d87dbf1fe47fbeb644818c5b69a392ce1e7c7780798440f5a4e65b42d37792edc8af9fb0f2d0e657772f8900f8dc0ba78a4
-  data.tar.gz: b6ad3b68c2efa9019828258cd78eb631699023bfa9dfe115b30f7792a8dd5cb1cce76243dcfdde6c43781116028db0673573991730038c1668c9dd4eab404b70
+  metadata.gz: 8720708bf788850d224c5bb46ef6376f2a18c04f82578e65ca32f5951eefa259e210fcb3b2b39c817415a76257d4d43394f5a75fa03ceceaf55d02d93984f4ad
+  data.tar.gz: 85d2c3825083117a09cd55d13ddd117c36e5d26b678250a229c58daa21808d326a9d95df62b54ea667495a2a969e5a324c2cebb0a2091bf4a44526dc8a56604f

data/lib/march_hare/channel.rb

@@ -268,7 +268,7 @@ module MarchHare
     def recover_consumers
       @consumers.values.each do |c|
         begin
-          self.unregister_consumer(c)
+          self.unregister_consumer(c.consumer_tag)
           c.recover_from_network_failure
         rescue Exception => e
           # TODO: logger

data/lib/march_hare/exceptions.rb

@@ -89,7 +89,8 @@ module MarchHare
   class ChannelAlreadyClosed < Exception
   end
 
-
+  class ConnectionForced < Exception
+  end
 
   # Converts RabbitMQ Java client exceptions
   #

data/lib/march_hare/metadata.rb

@@ -7,6 +7,11 @@ module MarchHare
       @consumer_tag = consumer_tag
       @envelope     = envelope
       @properties   = properties
+
+      # Prime the delivery tag when the instance is created. If #delivery_tag is first
+      # called after a recovery, then it'll fail to mismatch and will allow an invalid
+      # ack/nack, which will cause the channel to unexpectedly close
+      @delivery_tag = delivery_tag
     end
 
     def ack(options={})

data/lib/march_hare/session.rb

@@ -197,13 +197,13 @@ module MarchHare
       # recovering immediately makes little sense. Wait a bit first. MK.
       java.lang.Thread.sleep(ms)
 
-      @connection = converting_rjc_exceptions_to_ruby do
+      new_connection = converting_rjc_exceptions_to_ruby do
         reconnecting_on_network_failures(ms) do
           self.new_connection_impl
         end
       end
       @thread_pool = ThreadPools.dynamically_growing
-      self.recover_shutdown_hooks
+      self.recover_shutdown_hooks(new_connection)
 
       # sorting channels by id means that the cases like the following:
       #
@@ -219,18 +219,20 @@ module MarchHare
       # in the order the user expects and before bindings.
       @channels.sort_by {|id, _| id}.each do |id, ch|
         begin
-          ch.automatically_recover(self, @connection)
+          ch.automatically_recover(self, new_connection)
         rescue Exception, java.io.IOException => e
           # TODO: logging
           $stderr.puts e
         end
       end
+
+      @connection = new_connection
     end
 
     # @private
-    def recover_shutdown_hooks
+    def recover_shutdown_hooks(connection)
       @shutdown_hooks.each do |sh|
-        @connection.add_shutdown_listener(sh)
+        connection.add_shutdown_listener(sh)
       end
     end
 

data/lib/march_hare/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module MarchHare
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email: