right_agent 0.10.9 → 0.10.10

data/lib/right_agent/agent.rb

@@ -222,7 +222,13 @@ module RightScale
               end
             end
           elsif status == :failed
-            Log.error("Agent failed to connect to any brokers")
+            Log.error("Agent failed to connect to any brokers during startup")
+            EM.stop
+          elsif status == :timeout
+            Log.error("Agent failed to connect to any brokers after #{@options[:connect_timeout]} seconds during startup")
+            EM.stop
+          else
+            Log.error("Agent broker connect attempt failed unexpectedly with status #{status} during startup")
             EM.stop
           end
         end
@@ -465,14 +471,14 @@ module RightScale
     #
     # === Return
     # true:: Always return true
-    def terminate(&blk)
+    def terminate(&block)
       begin
         if @terminating
           Log.info("[stop] Terminating immediately")
           @termination_timer.cancel if @termination_timer
           @termination_timer = nil
-          blk.call if blk
-          EM.stop
+          block.call if block
+          EM.stop if EM.reactor_running?
         else
           @terminating = true
           @check_status_timer.cancel if @check_status_timer
@@ -489,8 +495,7 @@ module RightScale
                 request_count, request_age = @sender.terminate
                 Log.info("[stop] The following #{request_count} requests initiated as recently as #{request_age} " +
                          "seconds ago are being dropped:\n  " + @sender.dump_requests.join("\n  ")) if request_age
-                @broker.close { blk.call; EM.stop }
-                EM.stop unless blk
+                @broker.close { block.call if block; EM.stop if EM.reactor_running? }
               end
 
               wait_time = [timeout - (request_age || timeout), timeout - (dispatch_age || timeout), 0].max
@@ -508,16 +513,19 @@ module RightScale
                     finish.call
                   rescue Exception => e
                     Log.error("Failed while finishing termination", e, :trace)
-                    EM.stop
+                    EM.stop if EM.reactor_running?
                   end
                 end
               end
+            else
+              block.call if block
+              EM.stop if EM.reactor_running?
             end
           end
         end
       rescue Exception => e
         Log.error("Failed to terminate gracefully", e, :trace)
-        EM.stop
+        EM.stop if EM.reactor_running?
       end
       true
     end
@@ -729,7 +737,7 @@ module RightScale
           EM.next_tick do
             begin
               terminate do
-                EM.stop
+                EM.stop if EM.reactor_running?
                 old.call if old.is_a? Proc
               end
             rescue Exception => e

data/right_agent.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '0.10.9'
-  spec.date      = '2012-06-18'
+  spec.version   = '0.10.10'
+  spec.date      = '2012-06-25'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.8.7'
   spec.require_path = 'lib'
 
-  spec.add_dependency('right_support', '~> 1.3')
+  spec.add_dependency('right_support', ['>= 1.3', '< 3.0'])
   spec.add_dependency('right_amqp', '~> 0.3')
   spec.add_dependency('json', ['~> 1.4'])
   spec.add_dependency('eventmachine', '~> 0.12.10')

data/spec/agent_spec.rb

@@ -684,7 +684,7 @@ describe RightScale::Agent do
         @sender.should_receive(:terminate).and_return([1, 10]).twice
         @sender.should_receive(:dump_requests).and_return(["request"]).once
         @dispatcher.should_receive(:dispatch_age).and_return(10).once
-        @broker.should_receive(:close).once
+        @broker.should_receive(:close).and_yield.once
         flexmock(EM::Timer).should_receive(:new).with(20, Proc).and_return(@timer).and_yield.once
         run_in_em(stop_event_loop = false) do
           @agent = RightScale::Agent.new(:user => "me", :identity => @identity)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_agent
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 10
-  - 9
-  version: 0.10.9
+  - 10
+  version: 0.10.10
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -17,20 +17,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-18 00:00:00 -07:00
+date: 2012-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 9
         segments: 
         - 1
         - 3
         version: "1.3"
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   requirement: *id001
   name: right_support
   prerelease: false