right_agent 2.5.0-x86-mingw32 → 2.5.1-x86-mingw32

data/lib/right_agent/clients/base_retry_client.rb

@@ -286,9 +286,12 @@ module RightScale
             create_http_client
             if check_health == :connected
               enable_use
-              @stats["reconnects"].update("success")
-              @reconnect_timer.cancel if @reconnect_timer # only need 'if' for test purposes
-              @reconnect_timer = @reconnecting = nil
+              # Check state again since may have disconnected during enable_use
+              if self.state == :connected
+                @stats["reconnects"].update("success")
+                @reconnect_timer.cancel if @reconnect_timer # only need 'if' for test purposes
+                @reconnect_timer = @reconnecting = nil
+              end
             end
           rescue Exception => e
             ErrorTracker.log(self, "Failed #{@options[:server_name]} reconnect", e, nil, :caller)

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.5.0'
-  spec.date      = '2015-02-24'
+  spec.version   = '2.5.1'
+  spec.date      = '2015-03-13'
   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/base_retry_client_spec.rb

@@ -366,6 +366,13 @@ describe RightScale::BaseRetryClient do
         @client.send(:reconnect).should be_true
       end
 
+      it "rechecks state after enables use" do
+        flexmock(EM::PeriodicTimer).should_receive(:new).and_return(@timer).and_yield
+        flexmock(@client).should_receive(:enable_use).and_return { @client.instance_variable_set(:@state, :disconnected) }.once
+        @client.send(:reconnect).should be_true
+        @client.instance_variable_get(:@reconnecting).should be true
+      end
+
       it "disables timer" do
         @client.send(:reconnect); @client.instance_variable_set(:@reconnecting, nil) # to get @reconnect_timer initialized
         @client.instance_variable_set(:@reconnecting, nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
@@ -447,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1759897669862666077
+      hash: -2135434958328220214
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.26