march_hare 2.22.0-java → 3.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a889247b3117153a7ad84bd1ec2e4782e3d6a2ee
-  data.tar.gz: 9351d6dc9dfeae13a3d69c7cf0cfa4db2e83d4b8
+  metadata.gz: 24c5f476a2e6d0f317060d847bac5b3415a6af9e
+  data.tar.gz: cbd1a71d51155ca8898b89983c3409b08a914378
 SHA512:
-  metadata.gz: b0adce10eeff54a014a666f1df771ab98488515cd3c8b723cae40004db9e937de6df1a11c3665953e73df01542a50e388308f1ba0ba36dfc4461c26931740603
-  data.tar.gz: e0ab94b741fb34fc7ce7a676a0befeabb18acc88120547105ad151e17db783db1221a2bb9879d17829dad427d55b5de3a69e35b90a34af671082846bcf08c738
+  metadata.gz: 26dcc481444be82948f0234e493ab7c943e4f292e5f455e53acf1a1405b622846bf734d8f6bae3f10e06951b96ba760667fcc1a3e614484328fad7b61d486e87
+  data.tar.gz: 69586d383dacb082c63221b51fed78795d94d31377b77cf296cfd5a46b8ed348d39373916d75c617a70c450df09df87434f247396e842311abc61babc6c13089

data/lib/march_hare.rb

@@ -1,7 +1,11 @@
 # encoding: utf-8
 
 require 'java'
-require 'ext/commons-io'
+
+# Java client logging depends on SLF4J
+require 'ext/slf4j-api'
+require 'ext/slf4j-simple'
+
 require 'ext/rabbitmq-client'
 
 require 'march_hare/version'

data/lib/march_hare/channel.rb

@@ -985,7 +985,7 @@ module MarchHare
     def guarding_against_stale_delivery_tags(tag, &block)
       case tag
       # if a fixnum was passed, execute unconditionally. MK.
-      when Fixnum then
+      when Integer then
         block.call
         # versioned delivery tags should be checked to avoid
         # sending out stale (invalid) tags after channel was reopened

data/lib/march_hare/session.rb

@@ -9,6 +9,7 @@ module MarchHare
   java_import com.rabbitmq.client.Connection
   java_import com.rabbitmq.client.BlockedListener
   java_import com.rabbitmq.client.NullTrustManager
+  java_import com.rabbitmq.client.MissedHeartbeatException
 
   java_import javax.net.ssl.SSLContext
   java_import javax.net.ssl.KeyManagerFactory
@@ -121,6 +122,13 @@ module MarchHare
     # @private
     def initialize(connection_factory, opts = {})
       @cf               = connection_factory
+
+      # March Hare uses its own connection recovery implementation and
+      # as of Java client 4.x automatic recovery is enabled by
+      # default. MK.
+      @cf.automatic_recovery_enabled = false
+      @cf.topology_recovery_enabled  = false
+
       @uri              = opts[:uri]
       @uses_uri         = !(@uri.nil?)
       # executors cannot be restarted after shutdown,
@@ -239,7 +247,7 @@ module MarchHare
     # @private
     def add_automatic_recovery_hook
       fn = Proc.new do |_, signal|
-        if !signal.initiated_by_application
+        if should_initiate_connection_recovery?(signal)
           self.automatically_recover
         end
       end
@@ -247,6 +255,11 @@ module MarchHare
       @automatic_recovery_hook = self.on_shutdown(&fn)
     end
 
+    # @private
+    def should_initiate_connection_recovery?(signal)
+      !signal.initiated_by_application || signal.instance_of?(MissedHeartbeatException)
+    end
+
     # @private
     def disable_automatic_recovery
       @connection.remove_shutdown_listener(@automatic_recovery_hook) if @automatic_recovery_hook
@@ -321,6 +334,7 @@ module MarchHare
       #
       # So we stub out #start in case someone migrating from Bunny forgets to remove
       # the call to #start. MK.
+      self
     end
 
     def username

data/lib/march_hare/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 2.22.0
+  version: 3.0.0
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email:
@@ -19,8 +19,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ext/commons-io.jar
 - lib/ext/rabbitmq-client.jar
+- lib/ext/slf4j-api.jar
+- lib/ext/slf4j-simple.jar
 - lib/march_hare.rb
 - lib/march_hare/channel.rb
 - lib/march_hare/consumers.rb