right_amqp 0.8.4 → 0.8.5

data/README.rdoc

@@ -20,7 +20,7 @@ documentation.
 Also use the built-in issues tracker (https://github.com/rightscale/right_amqp/issues)
 to report issues.
 
-Maintained by the RightScale Teal Team
+Maintained by the RightScale Cornsilk Team
 
 == Interface
 

data/lib/right_amqp/ha_client/broker_client.rb

@@ -252,14 +252,14 @@ module RightAMQP
         if exchange
           x = @channel.__send__(exchange[:type], exchange[:name], exchange_options)
           binding = q.bind(x, options[:key] ? {:key => options[:key]} : {})
-          if exchange2 = options[:exchange2]
+          if (exchange2 = options[:exchange2])
             q.bind(@channel.__send__(exchange2[:type], exchange2[:name], exchange2[:options] || {}))
           end
           q = binding
         end
         q.subscribe(options[:ack] ? {:ack => true} : {}) do |header, message|
           begin
-            if pool = (options[:fiber_pool] || @options[:fiber_pool])
+            if (pool = (options[:fiber_pool] || @options[:fiber_pool]))
               pool.spawn { receive(queue[:name], header, message, options, &block) }
             else
               receive(queue[:name], header, message, options, &block)
@@ -269,7 +269,7 @@ module RightAMQP
             logger.exception("Failed setting up to receive message from queue #{queue.inspect} " +
                              "on broker #{@alias}", e, :trace)
             @exception_stats.track("receive", e)
-            @non_delivery_stats.update("receive failure")
+            update_non_delivery_stats("receive failure", e)
           end
         end
       rescue StandardError => e
@@ -412,11 +412,11 @@ module RightAMQP
       rescue StandardError => e
         logger.exception("Failed publishing to exchange #{exchange.inspect} on broker #{@alias}", e, :trace)
         @exception_stats.track("publish", e)
-        @non_delivery_stats.update("publish failure")
+        update_non_delivery_stats("publish failure", e)
         false
       end
     end
-
+3
     # Delete queue
     #
     # === Parameters
@@ -649,7 +649,7 @@ module RightAMQP
           # This happens as part of connecting an instance agent to a broker prior to version 13
           header.ack if options[:ack]
           logger.debug("RECV #{@alias} nil message ignored")
-        elsif packet = unserialize(queue, message, options)
+        elsif (packet = unserialize(queue, message, options))
           execute_callback(block, @identity, packet, header)
         elsif options[:ack]
           # Need to ack empty packet since no callback is being made
@@ -660,7 +660,7 @@ module RightAMQP
         header.ack if options[:ack]
         logger.exception("Failed receiving message from queue #{queue.inspect} on broker #{@alias}", e, :trace)
         @exception_stats.track("receive", e)
-        @non_delivery_stats.update("receive failure")
+        update_non_delivery_stats("receive failure", e)
       end
     end
 
@@ -697,11 +697,15 @@ module RightAMQP
         end
       rescue StandardError => e
         # TODO Taking advantage of Serializer knowledge here even though out of scope
-        trace = e.class.name =~ /SerializationError/ ? :caller : :trace
+        trace, track = case e.class.name.sub(/^.*::/, "")
+        when "SerializationError"  then [:caller, e.to_s !~ /MissingCertificate|MissingPrivateKey|InvalidSignature/]
+        when "ConnectivityFailure" then [:caller, false]
+        else                            [:trace, true]
+        end
         logger.exception("Failed unserializing message from queue #{queue.inspect} on broker #{@alias}", e, trace)
-        @exception_stats.track("receive", e) if e.to_s !~ /MissingCertificate/
+        @exception_stats.track("receive", e) if track
         @options[:exception_on_receive_callback].call(message, e) if @options[:exception_on_receive_callback]
-        @non_delivery_stats.update("receive failure")
+        update_non_delivery_stats("receive failure", e)
         nil
       end
     end
@@ -732,6 +736,19 @@ module RightAMQP
       true
     end
 
+    # Update non-delivery stats
+    #
+    # @param [String] type of non-delivery
+    # @param [Exception] exception associated with non-delivery
+    #
+    # @return [TrueClass] always true
+    def update_non_delivery_stats(type, exception)
+      update = type
+      update << " - #{exception.class.name.sub(/^.*::/, "")}"
+      @non_delivery_stats.update(update)
+      true
+    end
+
     # Handle message returned by broker because it could not deliver it
     #
     # === Parameters

data/right_amqp.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_amqp'
-  spec.version   = '0.8.4'
-  spec.date      = '2014-07-03'
+  spec.version   = '0.8.5'
+  spec.date      = '2014-10-02'
   spec.authors   = ['Lee Kirchhoff']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_amqp'

data/spec/ha_client/broker_client_spec.rb

@@ -26,6 +26,13 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'r
 class RequestMock; end
 class ResultMock; end
 
+module RightScale
+  class SerializationError < StandardError; end
+  class Exceptions
+    class ConnectivityFailure < StandardError; end
+  end
+end
+
 describe RightAMQP::BrokerClient do
 
   include FlexMock::ArgumentTypes
@@ -34,7 +41,7 @@ describe RightAMQP::BrokerClient do
   before(:each) do
     setup_logger
     @message = "message"
-    @packet = flexmock("packet", :class => RequestMock, :to_s => true, :version => [12, 12]).by_default
+    @packet = flexmock("packet", :class => RequestMock, :to_s => "packet", :version => [12, 12]).by_default
     @serializer = flexmock("serializer")
     @serializer.should_receive(:dump).and_return(@message).by_default
     @serializer.should_receive(:load).with(@message).and_return(@packet).by_default
@@ -262,25 +269,27 @@ describe RightAMQP::BrokerClient do
     it "should receive message and log exception if subscribe block fails and then ack if option set" do
       @logger.should_receive(:info).with(/Connecting/).once
       @logger.should_receive(:info).with(/Subscribing/).once
+      @logger.should_receive(:info).with(/RECV/).once
       @logger.should_receive(:error).with(/Failed receiving message/).once
       @exceptions.should_receive(:track).once
-      @non_deliveries.should_receive(:update).once
+      @non_deliveries.should_receive(:update).with("receive failure - RuntimeError").once
       @serializer.should_receive(:load).with(@message).and_return(@packet).once
       @header.should_receive(:ack).once
       @bind.should_receive(:subscribe).and_yield(@header, @message).once
       broker = RightAMQP::BrokerClient.new(@identity, @address, @serializer, @exceptions, @non_deliveries, @options)
       broker.__send__(:update_status, :ready)
       result = broker.subscribe({:name => "queue"}, {:type => :direct, :name => "exchange"},
-                                :ack => true, RequestMock => nil) {|b, p| raise Exception}
-      result.should be_false
+                                :ack => true, RequestMock => nil) {|b, p| raise RuntimeError}
+      result.should be_true
     end
 
     it "should log an error if a subscribe fails" do
       @logger.should_receive(:info).with(/Connecting/).once
+      @logger.should_receive(:info).with(/Subscribing/).once
       @logger.should_receive(:info).with(/RECV/).never
       @logger.should_receive(:error).with(/Failed subscribing/).once
       @exceptions.should_receive(:track).once
-      @bind.should_receive(:subscribe).and_raise(Exception)
+      @bind.should_receive(:subscribe).and_raise(StandardError)
       broker = RightAMQP::BrokerClient.new(@identity, @address, @serializer, @exceptions, @non_deliveries, @options)
       broker.__send__(:update_status, :ready)
       result = broker.subscribe({:name => "queue"}, {:type => :direct, :name => "exchange"}) {|_, _|}
@@ -441,7 +450,7 @@ describe RightAMQP::BrokerClient do
       broker.__send__(:unserialize, "queue", @message, RequestMock => nil, :no_log => true)
     end
 
-    it "should log an error if exception prevents normal logging and should then return nil" do
+    it "should log an error if exception prevents unserialization and should then return nil" do
       @logger.should_receive(:error).with(/Failed unserializing message from queue/).once
       @serializer.should_receive(:load).with(@message).and_raise(StandardError).once
       @exceptions.should_receive(:track).once
@@ -450,6 +459,39 @@ describe RightAMQP::BrokerClient do
       broker.__send__(:unserialize, "queue", @message).should be_nil
     end
 
+    it "should use lesser trace level for SerializationError exception" do
+      @serializer.should_receive(:load).with(@message).and_raise(RightScale::SerializationError, "failed").once
+      @exceptions.should_receive(:track).once
+      @non_deliveries.should_receive(:update).once
+      broker = RightAMQP::BrokerClient.new(@identity, @address, @serializer, @exceptions, @non_deliveries, @options)
+      logger = flexmock(broker.logger)
+      logger.should_receive(:exception).with(/Failed unserializing message from queue/, RightScale::SerializationError, :caller).once
+      broker.__send__(:unserialize, "queue", @message).should be_nil
+    end
+
+    it "should use lesser trace level for ConnectivityFailure exception and not track" do
+      @serializer.should_receive(:load).with(@message).and_raise(RightScale::Exceptions::ConnectivityFailure, "failed").once
+      @exceptions.should_receive(:track).never
+      @non_deliveries.should_receive(:update).once
+      broker = RightAMQP::BrokerClient.new(@identity, @address, @serializer, @exceptions, @non_deliveries, @options)
+      logger = flexmock(broker.logger)
+      logger.should_receive(:exception).with(/Failed unserializing message from queue/, RightScale::Exceptions::ConnectivityFailure, :caller).once
+      broker.__send__(:unserialize, "queue", @message).should be_nil
+    end
+
+    ["MissingCertificate", "MissingPrivateKey", "InvalidSignature"].each do |name|
+      it "should not track SerializationError containing #{name} exceptions" do
+        e = RightScale::SerializationError.new(name)
+        @serializer.should_receive(:load).with(@message).and_raise(e).once
+        @exceptions.should_receive(:track).never
+        @non_deliveries.should_receive(:update).once
+        broker = RightAMQP::BrokerClient.new(@identity, @address, @serializer, @exceptions, @non_deliveries, @options)
+        logger = flexmock(broker.logger)
+        logger.should_receive(:exception).with(/Failed unserializing message from queue/, e, :caller).once
+        broker.__send__(:unserialize, "queue", @message).should be_nil
+      end
+    end
+
     it "should make callback when there is a receive failure" do
       @logger.should_receive(:error).with(/Failed unserializing message from queue/).once
       @serializer.should_receive(:load).with(@message).and_raise(StandardError).once
@@ -834,7 +876,7 @@ describe RightAMQP::BrokerClient do
       @logger.should_receive(:debug).with("RETURN b0 for exchange because NO_CONSUMERS")
       @logger.should_receive(:error).with(/Failed return/).once
       @exceptions.should_receive(:track).once
-      @options = {:return_message_callback => lambda { |i, t, r, m| raise Exception } }
+      @options = {:return_message_callback => lambda { |i, t, r, m| raise StandardError } }
       broker = RightAMQP::BrokerClient.new(@identity, @address, @serializer, @exceptions, @non_deliveries, @options)
       broker.__send__(:handle_return, @header, @message).should be_true
     end
@@ -881,7 +923,7 @@ describe RightAMQP::BrokerClient do
       broker.delete("queue1").should be_false
     end
 
-  end # when deleteing
+  end # when deleting
 
   context "when monitoring" do
 

data/spec/spec_helper.rb

@@ -44,11 +44,13 @@ module RightAMQP
     def setup_logger
       @logger = flexmock("logger")
       @logger.should_receive(:level).and_return(:info).by_default
-      @logger.should_receive(:exception).by_default.and_return { |m| raise m }
       @logger.should_receive(:error).by_default.and_return { |m| raise m }
       @logger.should_receive(:warn).by_default.and_return { |m| raise m }
       @logger.should_receive(:info).by_default
       @logger.should_receive(:debug).by_default
+      # Note that the following puts the mock logger inside the default Decorator
+      # so the only way to mock the :exception interface is to flexmock the
+      # logger if the constructed class that uses RightSupport::Log::Mixin
       RightSupport::Log::Mixin.default_logger = @logger
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_amqp
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000Z
+date: 2014-10-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
-  requirement: &2160381580 !ruby/object:Gem::Requirement
+  requirement: &2160810180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160381580
+  version_requirements: *2160810180
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2160380600 !ruby/object:Gem::Requirement
+  requirement: &2160809020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,7 +38,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160380600
+  version_requirements: *2160809020
 description: ! 'RightAMQP provides a high availability client for interfacing with
   the
 
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1268186546585631642
+      hash: 1112736972796387367
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10