right_agent 0.9.4 → 0.9.5

data/lib/right_agent/agent.rb

@@ -174,6 +174,8 @@ module RightScale
       Log.init(@identity, @options[:log_path], :print => true)
       Log.level = @options[:log_level] if @options[:log_level]
       RightSupport::Log::Mixin.default_logger = Log
+      now = Time.now
+      Log.info("[start] Agent #{@identity} starting; time: #{now.utc}; utc_offset: #{now.utc_offset}")
       Log.debug("Start options:")
       log_opts = @options.inject([]){ |t, (k, v)| t << "-  #{k}: #{v}" }
       log_opts.each { |l| Log.debug(l) }
@@ -343,7 +345,7 @@ module RightScale
           end
         end
       rescue Exception => e
-        res = Log.format("Failed to connect to broker #{RightAMQP::HABrokerClient.identity(host, port)}", e)
+        res = Log.format("Failed to connect to broker at host #{host.inspect} and port #{port.inspect}", e)
         @exceptions.track("connect", e)
       end
       Log.error(res) if res

data/lib/right_agent/minimal.rb

@@ -23,6 +23,7 @@
 require 'rubygems'
 require 'eventmachine'
 require 'fileutils'
+require 'yaml'
 
 # load definition for File.normalize_path, etc.
 require File.expand_path(File.join(File.dirname(__FILE__), 'platform'))

data/lib/right_agent/platform/darwin.rb

@@ -79,7 +79,7 @@ module RightScale
 
       # Directory containing generated agent configuration files
       def right_agent_cfg_dir
-        '/etc/right_agent'
+        '/var/lib/rightscale/right_agent'
       end
 
       # Static (time-invariant) state that is common to all RightScale apps/agents

data/lib/right_agent/sender.rb

@@ -444,23 +444,26 @@ module RightScale
       # true:: Always return true
       def check(id = nil, max_ping_timeouts = MAX_PING_TIMEOUTS)
         unless @terminating || @ping_timer || (id && !@sender.broker.connected?(id))
+          @ping_id = id
           @ping_timer = EM::Timer.new(PING_TIMEOUT) do
-            begin
-              @ping_stats.update("timeout")
-              @ping_timer = nil
-              @ping_timeouts[id] = (@ping_timeouts[id] || 0) + 1
-              if @ping_timeouts[id] >= max_ping_timeouts
-                Log.error("Mapper ping via broker #{id} timed out after #{PING_TIMEOUT} seconds and now " +
-                          "reached maximum of #{max_ping_timeouts} timeout#{max_ping_timeouts > 1 ? 's' : ''}, " +
-                          "attempting to reconnect")
-                host, port, index, priority = @sender.broker.identity_parts(id)
-                @sender.agent.connect(host, port, index, priority, force = true)
-              else
-                Log.warning("Mapper ping via broker #{id} timed out after #{PING_TIMEOUT} seconds")
+            if @ping_id
+              begin
+                @ping_stats.update("timeout")
+                @ping_timer = nil
+                @ping_timeouts[@ping_id] = (@ping_timeouts[@ping_id] || 0) + 1
+                if @ping_timeouts[@ping_id] >= max_ping_timeouts
+                  Log.error("Mapper ping via broker #{@ping_id} timed out after #{PING_TIMEOUT} seconds and now " +
+                            "reached maximum of #{max_ping_timeouts} timeout#{max_ping_timeouts > 1 ? 's' : ''}, " +
+                            "attempting to reconnect")
+                  host, port, index, priority = @sender.broker.identity_parts(@ping_id)
+                  @sender.agent.connect(host, port, index, priority, force = true)
+                else
+                  Log.warning("Mapper ping via broker #{@ping_id} timed out after #{PING_TIMEOUT} seconds")
+                end
+              rescue Exception => e
+                Log.error("Failed to reconnect to broker #{@ping_id}", e, :trace)
+                @exception_stats.track("ping timeout", e)
               end
-            rescue Exception => e
-              Log.error("Failed to reconnect to broker #{id}", e, :trace)
-              @exception_stats.track("ping timeout", e)
             end
           end
 
@@ -470,7 +473,8 @@ module RightScale
                 @ping_stats.update("success")
                 @ping_timer.cancel
                 @ping_timer = nil
-                @ping_timeouts[id] = 0
+                @ping_timeouts[@ping_id] = 0
+                @ping_id = nil
               end
             rescue Exception => e
               Log.error("Failed to cancel mapper ping", e, :trace)
@@ -479,8 +483,8 @@ module RightScale
           end
           request = Request.new("/mapper/ping", nil, {:from => @sender.identity, :token => AgentIdentity.generate})
           @sender.pending_requests[request.token] = PendingRequest.new(:send_persistent_request, Time.now, handler)
-          ids = [id] if id
-          id = @sender.publish(request, ids).first
+          ids = [@ping_id] if @ping_id
+          @ping_id = @sender.publish(request, ids).first
         end
         true
       end

data/lib/right_agent.rb

@@ -24,7 +24,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'right_agent', 'minimal'))
 
 require 'json'
-require 'yaml'
 require 'openssl'
 require 'right_amqp'
 require 'right_support'

data/right_agent.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '0.9.4'
-  spec.date      = '2012-03-14'
+  spec.version   = '0.9.5'
+  spec.date      = '2012-03-17'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'

data/spec/agent_spec.rb

@@ -441,6 +441,7 @@ describe RightScale::Agent do
 
       it "should tune heartbeat for all broker connections" do
         run_in_em do
+          @log.should_receive(:info).with(/\[start\] Agent #{@identity} starting; time: .*$/).once
           @log.should_receive(:info).with(/Reconnecting each broker to tune heartbeat to 45/).once
           @log.should_receive(:info).with(/Tuned heartbeat to 45 seconds for broker/).twice
           @agent = RightScale::Agent.new(:user => "me", :identity => @identity)
@@ -458,6 +459,7 @@ describe RightScale::Agent do
 
       it "should tune heartbeat for all broker connections as deferred task" do
         run_in_em do
+          @log.should_receive(:info).with(/\[start\] Agent #{@identity} starting; time: .*$/).once
           @log.should_receive(:info).with(/Reconnecting each broker to tune heartbeat to 45/).once
           @log.should_receive(:info).with(/Tuned heartbeat to 45 seconds for broker/).twice
           @agent = RightScale::Agent.new(:user => "me", :identity => @identity)
@@ -478,6 +480,7 @@ describe RightScale::Agent do
 
       it "should disable heartbeat for all broker connections" do
         run_in_em do
+          @log.should_receive(:info).with(/\[start\] Agent #{@identity} starting; time: .*$/).once
           @log.should_receive(:info).with(/Reconnecting each broker to tune heartbeat to 0/).once
           @log.should_receive(:info).with(/Disabled heartbeat for broker/).twice
           @agent = RightScale::Agent.new(:user => "me", :identity => @identity)
@@ -495,6 +498,7 @@ describe RightScale::Agent do
 
       it "should log error if any broker connect attempts fail" do
         run_in_em do
+          @log.should_receive(:info).with(/\[start\] Agent #{@identity} starting; time: .*$/).once
           @log.should_receive(:info).with(/Reconnecting each broker to tune heartbeat to 45/).once
           @log.should_receive(:info).with(/Tuned heartbeat to 45 seconds for broker #{@broker_id2}/).once
           @log.should_receive(:error).with("Failed to reconnect to broker #{@broker_id} to tune heartbeat", Exception, :trace).once
@@ -513,6 +517,7 @@ describe RightScale::Agent do
 
       it "should log error if any brokers do not connect" do
         run_in_em do
+          @log.should_receive(:info).with(/\[start\] Agent #{@identity} starting; time: .*$/).once
           @log.should_receive(:info).with(/Reconnecting each broker to tune heartbeat to 45/).once
           @log.should_receive(:info).with(/Tuned heartbeat to 45 seconds for broker #{@broker_id2}/).once
           @log.should_receive(:error).with(/Failed to reconnect to broker #{@broker_id} to tune heartbeat, status/).once
@@ -533,6 +538,7 @@ describe RightScale::Agent do
 
       it "should log error if any broker queue setup fails" do
         run_in_em do
+          @log.should_receive(:info).with(/\[start\] Agent #{@identity} starting; time: .*$/).once
           @log.should_receive(:info).with(/Reconnecting each broker to tune heartbeat to 45/).once
           @log.should_receive(:info).with(/Tuned heartbeat to 45 seconds for broker #{@broker_id2}/).once
           @log.should_receive(:error).with(/Failed to setup queues for broker #{@broker_id} when tuning heartbeat/, Exception, :trace).once

data/spec/sender_spec.rb

@@ -133,6 +133,23 @@ describe RightScale::Sender do
       instance.connectivity_checker.check(broker_id)
     end
 
+    it "should ignore ping timeout if never successfully publish ping" do
+      @agent.should_receive(:options).and_return(:ping_interval => 1000)
+      old_ping_timeout = RightScale::Sender::ConnectivityChecker::PING_TIMEOUT
+      begin
+        RightScale::Sender::ConnectivityChecker.const_set(:PING_TIMEOUT, 0.5)
+        EM.run do
+          EM.add_timer(1) { EM.stop }
+          RightScale::Sender.new(@agent)
+          instance = RightScale::Sender.instance
+          flexmock(instance).should_receive(:publish).and_return([]).once
+          instance.connectivity_checker.check(id = nil)
+        end
+      ensure
+        RightScale::Sender::ConnectivityChecker.const_set(:PING_TIMEOUT, old_ping_timeout)
+      end
+    end
+
     it "should ignore messages received if ping disabled" do
       @agent.should_receive(:options).and_return(:ping_interval => 0)
       flexmock(EM::Timer).should_receive(:new).never

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_agent
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-14 00:00:00 -07:00
+date: 2012-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency