right_agent 2.4.4 → 2.4.5

data/lib/right_agent/clients/non_blocking_client.rb

@@ -206,7 +206,7 @@ module RightScale
       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}"]
+      else [504, (error && error.to_s) || "HTTP connection failure for #{verb.to_s.upcase}"]
       end
     end
 

data/lib/right_agent/eventmachine_spawn.rb

@@ -45,6 +45,16 @@ module EventMachineSpawn
     EM.next_tick(*args) { @fiber_pool ? @fiber_pool.spawn(&block) : yield }
   end
 
+  def self.wait(seconds)
+    if @fiber_pool
+      fiber = Fiber.current
+      EM.add_timer(seconds) { fiber.resume }
+      Fiber.yield
+    else
+      sleep(seconds)
+    end
+  end
+
   def self.add_timer(*args, &block)
     EM.add_timer(*args) { @fiber_pool ? @fiber_pool.spawn(&block) : yield }
   end
@@ -67,4 +77,4 @@ module EventMachineSpawn
 end
 
 # Alias for EventMachineSpawn
-EM_S = EventMachineSpawn
+EM_S = EventMachineSpawn

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.4.4'
-  spec.date      = '2014-10-23'
+  spec.version   = '2.4.5'
+  spec.date      = '2015-01-28'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro', 'Scott Messier']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'

data/spec/clients/non_blocking_client_spec.rb

@@ -253,15 +253,15 @@ describe RightScale::NonBlockingClient do
         @request_options[:path].should == "/api/foo/bar"
       end
 
-      it "converts connection errors to 500 by default" do
-        @headers.http_status = 500
+      it "converts connection errors to 504 by default" do
+        @headers.http_status = 504
         @response.should_receive(:errback).and_yield.once
         @response.should_receive(:error).and_return(nil)
-        @fiber.should_receive(:resume).with(500, "HTTP connection failure for GET").once
-        flexmock(Fiber).should_receive(:yield).and_return([500, "HTTP connection failure for GET"]).once
+        @fiber.should_receive(:resume).with(504, "HTTP connection failure for GET").once
+        flexmock(Fiber).should_receive(:yield).and_return([504, "HTTP connection failure for GET"]).once
         flexmock(EM::HttpRequest).should_receive(:new).with(@host, @connect_options).and_return(@request).once
         lambda { @client.request(:get, @path, @host, @connect_options, @request_options) }.
-            should raise_error(RightScale::HttpExceptions::InternalServerError)
+            should raise_error(RightScale::HttpExceptions::GatewayTimeout)
       end
 
       it "converts Errno::ETIMEDOUT error to 408 RequestTimeout" do
@@ -353,7 +353,7 @@ describe RightScale::NonBlockingClient do
         it "stops polling if there is an error" do
           @response.should_receive(:error).and_return("some error").once
           @response.should_receive(:errback).and_yield.once
-          @fiber.should_receive(:resume).with(500, "some error").once
+          @fiber.should_receive(:resume).with(504, "some error").once
           @client.send(:poll_again, @fiber, @request, @request_options, @stop_at).should be true
         end
 
@@ -408,12 +408,12 @@ describe RightScale::NonBlockingClient 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"]
+    it "converts error to 504 GatewayTimeout by default" do
+      @client.send(:handle_error, :get, "failed").should == [504, "failed"]
     end
 
-    it "generates error message for 500 InternalServerError if none specified" do
-      @client.send(:handle_error, :get, nil).should == [500, "HTTP connection failure for GET"]
+    it "generates error message for 504 GatewayTimeout if none specified" do
+      @client.send(:handle_error, :get, nil).should == [504, "HTTP connection failure for GET"]
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
@@ -415,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2766248071266273264
+      hash: -1955218884392609250
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.26