march_hare 2.0.0.rc4-java → 2.0.0.rc5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f065caf463f688b529731afb0836d0e82f521df
-  data.tar.gz: 4eea56b6d2f68dfa448770b844a084a34f4e8661
+  metadata.gz: c3751b35f7f4b24f8b9025947c7434302377ddde
+  data.tar.gz: 9e704b59d72ff697d2719d763c8018cbbe7019cd
 SHA512:
-  metadata.gz: 94d6f44bba40d0b97299f02f856a9f8fea49b50ed007c2c8e67daaa1ec7d573447d3b8ff6144df74611adf6690fbcb1a9888b8baaf5f069e96335f7a0118e9a0
-  data.tar.gz: be9226fe597a26584fd7099c9f1d23a421778fb65077605cea34c616712d10a306333a458c7ca0806b980016788d33645102cf256b288775e22f42bafca43cc3
+  metadata.gz: 1401bc111360744377a3d1eb46104caa6613bbc0607fd57edd02edefa1aaa3a556b6a95efc1f34f7f6f62bd56122fe80f59da9345f2c81679dedd49edce4b284
+  data.tar.gz: 30f4e4bf8d075b88595166cd7b6668f2cd119536478a622f6600bfb51da1a61b70112211c35985a3085c101df3d9908e06855314f97075eb49bb04cd7a60b6df

data/lib/march_hare/channel.rb

@@ -188,7 +188,7 @@ module MarchHare
 
       self.recover_prefetch_setting
       self.recover_exchanges
-      # this includes recovering bindings
+      # # this includes bindings recovery
       self.recover_queues
       self.recover_consumers
       self.increment_recoveries_counter
@@ -218,7 +218,12 @@ module MarchHare
     #
     def recover_exchanges
       @exchanges.values.each do |x|
-        x.recover_from_network_failure
+        begin
+          x.recover_from_network_failure
+        rescue Exception => e
+          # TODO: logger
+          $stderr.puts "Caught exception when recovering exchange #{x.name}"
+        end
       end
     end
 
@@ -226,7 +231,12 @@ module MarchHare
     # Recovery feature.
     def recover_queues
       @queues.values.each do |q|
-        q.recover_from_network_failure
+        begin
+          q.recover_from_network_failure
+        rescue Exception => e
+          # TODO: logger
+          $stderr.puts "Caught exception when recovering queue #{q.name}"
+        end
       end
     end
 
@@ -234,14 +244,19 @@ module MarchHare
     # Recovery feature.
     def recover_consumers
       @consumers.values.each do |c|
-        self.unregister_consumer(c)
-        c.recover_from_network_failure
+        begin
+          self.unregister_consumer(c)
+          c.recover_from_network_failure
+        rescue Exception => e
+          # TODO: logger
+          $stderr.puts "Caught exception when recovering consumer #{c.consumer_tag}"
+        end
       end
     end
 
     # @private
     def increment_recoveries_counter
-      @recoveries_counter.increment
+      @recoveries_counter.increment_and_get
     end
 
     attr_reader :recoveries_counter
@@ -805,6 +820,12 @@ module MarchHare
       self.add_return_listener(BlockReturnListener.from(block))
     end
 
+    # Defines a publisher confirm handler
+    # @see http://rubymarchhare.info/articles/exchanges.html Exchanges and Publishers guide
+    def on_confirm(&block)
+      self.add_confirm_listener(BlockConfirmListener.from(block))
+    end
+
     def method_missing(selector, *args)
       @delegate.__send__(selector, *args)
     end
@@ -814,6 +835,27 @@ module MarchHare
     # Implementation
     #
 
+    # @private
+    class BlockConfirmListener
+      include com.rabbitmq.client.ConfirmListener
+
+      def self.from(block)
+        new(block)
+      end
+
+      def initialize(block)
+        @block = block
+      end
+
+      def handleAck(delivery_tag, multiple)
+        @block.call(:ack, delivery_tag, multiple)
+      end
+
+      def handleNack(delivery_tag, multiple)
+        @block.call(:nack, delivery_tag, multiple)
+      end
+    end
+
     # @private
     class BlockReturnListener
       include com.rabbitmq.client.ReturnListener

data/lib/march_hare/exceptions.rb

@@ -38,6 +38,9 @@ module MarchHare
 
   # Raised when RabbitMQ closes network connection before
   # finalizing the connection, typically indicating authentication failure.
+  #
+  # RabbitMQ versions beyond 3.2 use a better defined authentication failure
+  # notifications.
   class PossibleAuthenticationFailureError < Exception
     attr_reader :username, :vhost
 
@@ -45,10 +48,19 @@ module MarchHare
       @username = username
       @vhost    = vhost
 
-      super("RabbitMQ closed TCP connection before authentication succeeded: this usually means authentication failure due to misconfiguration or that RabbitMQ version does not support AMQP 0.9.1. Please check your configuration. Username: #{username}, vhost: #{vhost}, password length: #{password_length}")
+      super("Authentication with RabbitMQ failed or RabbitMQ version used does not support AMQP 0-9-1. Username: #{username}, vhost: #{vhost}, password length: #{password_length}. Please check your configuration.")
     end
   end
 
+  # Raised when RabbitMQ 3.2+ reports authentication
+  # failure before closing TCP connection.
+  class AuthenticationFailureError < PossibleAuthenticationFailureError
+    attr_reader :username, :vhost
+
+    def initialize(username, vhost, password_length)
+      super(username, vhost, password_length)
+    end
+  end
 
   class PreconditionFailed < ChannelLevelException
   end

data/lib/march_hare/exchange.rb

@@ -7,6 +7,7 @@ module MarchHare
   #
   # @see http://rubymarchhare.info/articles/exchanges.html Exchanges and Publishing guide
   # @see http://rubymarchhare.info/articles/extensions.html RabbitMQ Extensions guide
+  # @see Queue#bind
   class Exchange
     # @return [String] Exchange name
     attr_reader :name
@@ -17,6 +18,23 @@ module MarchHare
     # @return [Symbol]
     attr_reader :type
 
+    # Instantiates a new exchange.
+    #
+    # @param [Channel] channel Channel to declare exchange on
+    # @params [String] name Exchange name
+    # @params [Hash] options ({}) Exchange and declaration attributes
+    #
+    # @options opts :type [Symbol, String] Exchange type
+    # @options opts :durable [Boolean] (false) Will the exchange be durable?
+    # @options opts :auto_delete [Boolean] (false) Will the exchange be auto-deleted?
+    # @options opts :passive [Boolean] (false) Should passive declaration be used?
+    #
+    # @see MarchHare::Channel#default_exchange
+    # @see MarchHare::Channel#fanout
+    # @see MarchHare::Channel#topic
+    # @see MarchHare::Channel#direct
+    # @see MarchHare::Channel#headers
+    # @see MarchHare::Channel#exchange
     def initialize(channel, name, options = {})
       raise ArgumentError, "exchange channel cannot be nil" if channel.nil?
       raise ArgumentError, "exchange name cannot be nil" if name.nil?
@@ -146,7 +164,16 @@ module MarchHare
     # @private
     def recover_from_network_failure
       # puts "Recovering exchange #{@name} from network failure"
-      declare! unless predefined?
+      unless predefined?
+        begin
+          declare!
+
+          @channel.register_exchange(self)
+        rescue Exception => e
+          # TODO: use a logger
+          puts "Caught #{e.inspect} while redeclaring and registering exchange #{@name}!"
+        end
+      end
     end
   end
 end

data/lib/march_hare/queue.rb

@@ -224,6 +224,11 @@ module MarchHare
     # Implementation
     #
 
+    # @return [Boolean] true if this queue is a pre-defined one (amq.direct, amq.fanout, amq.match and so on)
+    def predefined?
+      @name.start_with?("amq.")
+    end
+
     # @private
     def declare!
       response = if @options[:passive]
@@ -242,15 +247,9 @@ module MarchHare
         @channel.deregister_queue_named(old_name)
       end
 
-      # puts "Recovering queue #{@name}"
-      begin
-        declare!
+      declare! if !predefined?
 
-        @channel.register_queue(self)
-      rescue Exception => e
-        # TODO: use a logger
-        puts "Caught #{e.inspect} while redeclaring and registering #{@name}!"
-      end
+      @channel.register_queue(self)
       recover_bindings
     end
 

data/lib/march_hare/session.rb

@@ -6,6 +6,7 @@ require "march_hare/thread_pools"
 module MarchHare
   java_import com.rabbitmq.client.ConnectionFactory
   java_import com.rabbitmq.client.Connection
+  java_import com.rabbitmq.client.BlockedListener
 
   # Connection to a RabbitMQ node.
   #
@@ -135,6 +136,11 @@ module MarchHare
     end
     alias connected? open?
 
+    # @return [Boolean] true if this channel is closed
+    def closed?
+      !@connection.open?
+    end
+
     # Defines a shutdown event callback. Shutdown events are
     # broadcasted when a connection is closed, either explicitly
     # or forcefully, or due to a network/peer failure.
@@ -147,6 +153,22 @@ module MarchHare
       sh
     end
 
+    # Defines a connection.blocked handler
+    def on_blocked(&block)
+      self.add_blocked_listener(BlockBlockedUnblockedListener.for_blocked(block))
+    end
+
+    # Defines a connection.unblocked handler
+    def on_unblocked(&block)
+      self.add_blocked_listener(BlockBlockedUnblockedListener.for_unblocked(block))
+    end
+
+    # Clears all callbacks defined with #on_blocked and #on_unblocked.
+    def clear_blocked_connection_callbacks
+      @connection.clear_blocked_listeners
+    end
+
+
     # @private
     def add_automatic_recovery_hook
       fn = Proc.new do |_, signal|
@@ -178,8 +200,25 @@ module MarchHare
       @thread_pool = ThreadPools.dynamically_growing
       self.recover_shutdown_hooks
 
-      @channels.each do |id, ch|
-        ch.automatically_recover(self, @connection)
+      # sorting channels by id means that the cases like the following:
+      #
+      # ch1 = conn.create_channel
+      # ch2 = conn.create_channel
+      #
+      # x   = ch1.topic("logs", :durable => false)
+      # q   = ch2.queue("", :exclusive => true)
+      #
+      # q.bind(x)
+      #
+      # will recover correctly because exchanges and queues will be recovered
+      # in the order the user expects and before bindings.
+      @channels.sort_by {|id, _| id}.each do |id, ch|
+        begin
+          ch.automatically_recover(self, @connection)
+        rescue Exception, java.io.IOException => e
+          # TODO: logging
+          $stderr.puts e
+        end
       end
     end
 
@@ -319,6 +358,8 @@ module MarchHare
         raise ConnectionRefused.new("Connection to #{@cf.host}:#{@cf.port} refused")
       rescue java.net.UnknownHostException => e
         raise ConnectionRefused.new("Connection to #{@cf.host}:#{@cf.port} refused: host unknown")
+      rescue com.rabbitmq.client.AuthenticationFailureException => e
+        raise AuthenticationFailureError.new(@cf.username, @cf.virtual_host, @cf.password.bytesize)
       rescue com.rabbitmq.client.PossibleAuthenticationFailureException => e
         raise PossibleAuthenticationFailureError.new(@cf.username, @cf.virtual_host, @cf.password.bytesize)
       end
@@ -356,5 +397,44 @@ module MarchHare
         return Proc.new { MarchHare::ThreadPools.fixed_of_size(n) }
       end
     end
+
+    # Ruby blocks-based BlockedListener that handles
+    # connection.blocked and connection.unblocked.
+    # @private
+    class BlockBlockedUnblockedListener
+      include com.rabbitmq.client.BlockedListener
+
+      def self.for_blocked(block)
+        new(block, noop_fn1)
+      end
+
+      def self.for_unblocked(block)
+        new(noop_fn0, block)
+      end
+
+      # Returns a no-op function of arity 0.
+      def self.noop_fn0
+        Proc.new {}
+      end
+
+      # Returns a no-op function of arity 1.
+      def self.noop_fn1
+        Proc.new { |_| }
+      end
+
+      def initialize(on_blocked, on_unblocked)
+        @blocked   = on_blocked
+        @unblocked = on_unblocked
+      end
+
+      def handle_blocked(reason)
+        @blocked.call(reason)
+      end
+
+      def handle_unblocked()
+        @unblocked.call()
+      end
+    end
+
   end
 end

data/lib/march_hare/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module MarchHare
-  VERSION = "2.0.0.rc4"
+  VERSION = "2.0.0.rc5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: march_hare
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc4
+  version: 2.0.0.rc5
 platform: java
 authors:
 - Theo Hultberg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies: []
 description: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 email:
@@ -56,8 +56,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: march_hare
-rubygems_version: 2.1.5
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: RabbitMQ client for JRuby built around the official RabbitMQ Java client
 test_files: []
+has_rdoc: