right_agent 2.4.2 → 2.4.3

data/lib/right_agent/clients/non_blocking_client.rb

@@ -205,6 +205,7 @@ module RightScale
       case error.to_s
       when "terminating", "reconnecting" then [200, nil]
       when "Errno::ETIMEDOUT" then [408, "Request timeout"]
+      when "Errno::ECONNREFUSED" then [503, "Connection refused"]
       else [500, (error && error.to_s) || "HTTP connection failure for #{verb.to_s.upcase}"]
       end
     end

data/lib/right_agent/exceptions.rb

@@ -36,7 +36,7 @@ module RightScale
     end
 
     # Internal application error
-    class Application < StandardError; end
+    class Application < NestedException; end
 
     # Agent command IO error
     class IO < RuntimeError; end

data/lib/right_agent/log.rb

@@ -200,10 +200,14 @@ module RightScale
           description += " (#{exception}"
           backtrace = :no_trace
         end
-        case backtrace
-        when :no_trace then description += ")"
-        when :caller   then description += " in " + exception.backtrace[0] + ")"
-        when :trace    then description += " in\n  " + exception.backtrace.join("\n  ") + ")"
+        if exception.respond_to?(:backtrace) && exception.backtrace
+          case backtrace
+          when :no_trace then description += ")"
+          when :caller   then description += " in " + exception.backtrace[0] + ")"
+          when :trace    then description += " in\n  " + exception.backtrace.join("\n  ") + ")"
+          end
+        else
+          description += ")"
         end
       end
       description

data/lib/right_agent/serialize/secure_serializer.rb

@@ -87,9 +87,6 @@ module RightScale
     #
     # === Return
     # (String):: MessagePack serialized and optionally encrypted object
-    #
-    # === Raise
-    # Exception:: If certificate identity, certificate store, certificate, or private key missing
     def dump(obj, encrypt = nil)
       must_encrypt = encrypt || @encrypt
       serialize_format = if obj.respond_to?(:send_version) && can_handle_msgpack_result?(obj.send_version)
@@ -124,8 +121,8 @@ module RightScale
     # (Object):: Unserialized object
     #
     # === Raise
-    # Exception:: If certificate store, certificate, or private key missing
-    # MissingCertificate:: If could not find certificate for message signer
+    # MissingCertificate:: If could not find certificate for message signer or receiver
+    # MissingPrivateKey:: If could not find private key for message receiver
     # InvalidSignature:: If message signature check failed for message
     def load(msg, id = nil)
       msg = @serializer.load(msg)

data/lib/right_agent/serialize/serializer.rb

@@ -140,15 +140,19 @@ module RightScale
     #
     # === Raises
     # SerializationError:: If none of the serializers can perform the requested action
+    # RightScale::Exceptions::ConnectivityFailure:: If cannot access external services
     def cascade_serializers(action, packet, serializers, id = nil)
       errors = []
       serializers.map do |serializer|
         obj = nil
         begin
-          obj = serializer == SecureSerializer ? serializer.send(action, packet, id) :  serializer.send(action, packet)
-        rescue SecureSerializer::MissingCertificate, SecureSerializer::InvalidSignature => e
+          obj = serializer == SecureSerializer ? serializer.send(action, packet, id) : serializer.send(action, packet)
+        rescue RightSupport::Net::NoResult, SocketError => e
+          raise Exceptions::ConnectivityFailure.new("Failed to #{action} with #{serializer.name} due to external " +
+                                                    "service access failures (#{e.class.name}: #{e.message})", e)
+        rescue SecureSerializer::MissingCertificate, SecureSerializer::MissingPrivateKey, SecureSerializer::InvalidSignature => e
           errors << Log.format("Failed to #{action} with #{serializer.name}", e)
-        rescue Exception => e
+        rescue StandardError => e
           errors << Log.format("Failed to #{action} with #{serializer.name}", e, :trace)
         end
         return obj if obj

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.4.2'
-  spec.date      = '2014-08-26'
+  spec.version   = '2.4.3'
+  spec.date      = '2014-10-02'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro', 'Scott Messier']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.require_path = 'lib'
 
   spec.add_dependency('right_support', ['>= 2.4.1', '< 3.0'])
-  spec.add_dependency('right_amqp', '~> 0.7')
+  spec.add_dependency('right_amqp', '~> 0.8')
   spec.add_dependency('rest-client', '~> 1.7.0.3')
   spec.add_dependency('faye-websocket', '~> 0.7.0')
   spec.add_dependency('eventmachine', ['>= 0.12.10', '< 2.0'])

data/spec/clients/non_blocking_client_spec.rb

@@ -404,6 +404,10 @@ describe RightScale::NonBlockingClient do
       @client.send(:handle_error, :get, Errno::ETIMEDOUT).should == [408, "Request timeout"]
     end
 
+    it "converts Errno::ECONNREFUSED to 503 ServiceUnavailable" do
+      @client.send(:handle_error, :get, Errno::ECONNREFUSED).should == [503, "Connection refused"]
+    end
+
     it "converts error to 500 InternalServerError by default" do
       @client.send(:handle_error, :get, "failed").should == [500, "failed"]
     end

data/spec/log_spec.rb

@@ -187,6 +187,10 @@ describe RightScale::Log do
       log_count("Test error \\\(NoMethodError: undefined method \\\`\\\+\' for nil:NilClass in$").should == 1
     end
 
+    it 'should not attempt to use backtrace if exception has none' do
+      RightScale::Log.error("Test error", RuntimeError.new("failed"), :trace)
+      log_count("Test error \\\(RuntimeError: failed\\\)$").should == 1
+    end
   end
 
 end

data/spec/serialize/serializer_spec.rb

@@ -77,6 +77,12 @@ describe RightScale::Serializer do
       lambda { serializer.dump("hello") }.should raise_error(RightScale::Serializer::SerializationError)
     end
 
+    it "should raise ConnectivityFailure if packet could not be serialized for connectivity reasons" do
+      flexmock(RightScale::SecureSerializer).should_receive(:dump).with("hello", nil).and_raise(SocketError).once
+      serializer = RightScale::Serializer.new(:secure)
+      lambda { serializer.dump("hello") }.should raise_error(RightScale::Exceptions::ConnectivityFailure)
+    end
+
     it "should return serialized packet" do
       serialized_packet = flexmock("Packet")
       flexmock(MessagePack).should_receive(:dump).with("hello").and_return(serialized_packet).once
@@ -185,6 +191,14 @@ describe RightScale::Serializer do
       lambda { serializer.load("olleh") }.should raise_error(RightScale::Serializer::SerializationError)
     end
 
+    it "should raise ConnectivityFailure if packet could not be unserialized for connectivity reasons" do
+      serialized = "securely serialized"
+      flexmock(RightScale::SecureSerializer).should_receive(:load).with(serialized, "id").
+          and_raise(RightSupport::Net::NoResult.new("failed")).once
+      serializer = RightScale::Serializer.new(:secure)
+      lambda { serializer.load(serialized, "id") }.should raise_error(RightScale::Exceptions::ConnectivityFailure)
+    end
+
     it "should return unserialized packet" do
       unserialized_packet = flexmock("Packet")
       flexmock(MessagePack).should_receive(:load).with("olleh").and_return(unserialized_packet).once

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
+  prerelease: 
 platform: ruby
 authors:
 - Lee Kirchhoff
@@ -11,164 +12,194 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: right_amqp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.0.3
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.10
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.10
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-description: |
-  RightAgent provides a foundation for running an agent on a server to interface
+description: ! 'RightAgent provides a foundation for running an agent on a server
+  to interface
+
   in a secure fashion with other agents in the RightScale system using RightNet,
+
   which operates in either HTTP or AMQP mode. When using HTTP, RightAgent
+
   makes requests to RightApi servers and receives requests using long-polling or
+
   WebSockets via the RightNet router. To respond to requests it posts to the
+
   HTTP router. When using AMQP, RightAgent uses RabbitMQ as the message bus and
+
   the RightNet router as the routing node to make requests; to receives requests
+
   routed to it by the RightNet router, it establishes a queue on startup. The
+
   packets are structured to invoke services in the agent represented by actors
+
   and methods. The RightAgent may respond to these requests with a result packet
+
   that the router then routes to the originator.
+
+'
 email: lee@rightscale.com
 executables: []
 extensions: []
@@ -361,29 +392,33 @@ files:
 - spec/tracer_spec.rb
 homepage: https://github.com/rightscale/right_agent
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
-- "--main"
+- --main
 - README.rdoc
-- "--title"
+- --title
 - RightAgent
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3291070338952462239
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.26
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Agent for interfacing server with RightScale system
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 2f847073e46487c064b8b6f889f911cce5e4f108
-  data.tar.gz: 3d3e8c151fd4175d18925826183e06fa53492d1b
-SHA512:
-  metadata.gz: 9422e92a47df194278674c186abb7f0b28d8235b901ae01a5c1313f4e3955a66515717a6b2ef47acd90a8e838f4c6734399978b5d50a8ed24096bfcae0e8e7b3
-  data.tar.gz: ad341db3b0ff0a704ccee785966cefedc0c134ec7c71a259e6973969a968b05a6358b3685b90c4d76dd030b09ee0cd444f6d706aab7a00909b8ee864e127015f