right_agent 2.2.1-x86-mingw32 → 2.4.3-x86-mingw32

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/pending_requests_spec.rb

@@ -120,7 +120,7 @@ describe RightScale::PendingRequests do
       flexmock(Time).should_receive(:now).and_return(now, now + 10, now + 10, now + 20, now + 20, now + 30)
       pending_requests = RightScale::PendingRequests.new
       add_requests(pending_requests, [@request, @push])
-      pending_requests.youngest_age.should == 10
+      RightScale::PendingRequests.youngest_age(pending_requests).should == 10
     end
   end
 
@@ -130,7 +130,7 @@ describe RightScale::PendingRequests do
       flexmock(Time).should_receive(:now).and_return(now, now + 10, now + 10, now + 20, now + 20, now + 30)
       pending_requests = RightScale::PendingRequests.new
       add_requests(pending_requests, [@request, @push])
-      pending_requests.oldest_age.should == 20
+      RightScale::PendingRequests.oldest_age(pending_requests).should == 20
     end
   end
 end

data/spec/sender_spec.rb

@@ -921,7 +921,7 @@ describe RightScale::Sender do
 
         context "when fails" do
           it "raises TemporarilyOffline if no connected brokers" do
-            @log.should_receive(:error).with(/Failed to publish/, RightAMQP::HABrokerClient::NoConnectedBrokers).once
+            @log.should_receive(:error).with(/Failed to publish/, RightAMQP::HABrokerClient::NoConnectedBrokers, :no_trace).once
             @client.should_receive(:publish).and_raise(RightAMQP::HABrokerClient::NoConnectedBrokers).once
             lambda { @sender.send(:amqp_send_once, @packet) }.should raise_error(RightScale::Sender::TemporarilyOffline)
           end
@@ -947,7 +947,7 @@ describe RightScale::Sender do
         end
 
         it "does not rescue if publish fails" do
-          @log.should_receive(:error).with(/Failed to publish request/, RightAMQP::HABrokerClient::NoConnectedBrokers).once
+          @log.should_receive(:error).with(/Failed to publish request/, RightAMQP::HABrokerClient::NoConnectedBrokers, :no_trace).once
           @client.should_receive(:publish).and_raise(RightAMQP::HABrokerClient::NoConnectedBrokers).once
           lambda { @sender.send(:amqp_send_retry, @packet, @token) }.should raise_error(RightScale::Sender::TemporarilyOffline)
         end
@@ -1040,7 +1040,7 @@ describe RightScale::Sender do
             @client.should_receive(:publish).and_return(@broker_ids).once.ordered
             @client.should_receive(:publish).and_raise(RightAMQP::HABrokerClient::NoConnectedBrokers).once.ordered
             flexmock(EM).should_receive(:add_timer).and_yield.once
-            @log.should_receive(:error).with(/Failed to publish request/, RightAMQP::HABrokerClient::NoConnectedBrokers).once
+            @log.should_receive(:error).with(/Failed to publish request/, RightAMQP::HABrokerClient::NoConnectedBrokers, :no_trace).once
             @log.should_receive(:error).with(/Failed retry.*temporarily offline/).once
             @sender.send(:amqp_send, :send_request, @target, @packet, @received_at, &@callback).should be_true
             @sender.pending_requests[@token].should_not be_nil

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

data/spec/spec_helper.rb

@@ -40,6 +40,8 @@ $TESTING = true
 $VERBOSE = nil # Disable constant redefined warning
 TEST_SOCKET_PORT = 80000
 
+RightScale::ErrorTracker.init(RightScale::Agent, "test_agent", :trace_level => RightScale::Agent::TRACE_LEVEL)
+
 module RightScale
 
   module SpecHelper
@@ -79,8 +81,8 @@ end
 def version_cannot_put_version_in_packet; RightScale::Packet::DEFAULT_VERSION end
 def version_can_put_version_in_packet; 12 end
 
-def version_cannot_use_mapper_query_tags; 7 end
-def version_can_use_mapper_query_tags; 8 end
+def version_cannot_use_router_query_tags; 7 end
+def version_can_use_router_query_tags; 8 end
 
 def version_cannot_handle_request_retries; 8 end
 def version_can_handle_request_retries; 9 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.4.3
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,29 +51,29 @@ dependencies:
     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.1
+        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.1
+        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
@@ -81,7 +81,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
@@ -293,6 +293,7 @@ files:
 - lib/right_agent/dispatched_cache.rb
 - lib/right_agent/dispatcher.rb
 - lib/right_agent/enrollment_result.rb
+- lib/right_agent/error_tracker.rb
 - lib/right_agent/eventmachine_spawn.rb
 - lib/right_agent/exceptions.rb
 - lib/right_agent/history.rb
@@ -385,6 +386,7 @@ files:
 - spec/dispatched_cache_spec.rb
 - spec/dispatcher_spec.rb
 - spec/enrollment_result_spec.rb
+- spec/error_tracker_spec.rb
 - spec/history_spec.rb
 - spec/http_exceptions_spec.rb
 - spec/log_spec.rb
@@ -444,7 +446,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 354755465369324207
+      hash: -3291070338952462239
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.26