right_agent 2.0.7 → 2.0.8

data/lib/right_agent/agent.rb

@@ -193,11 +193,7 @@ module RightScale
       @history.update("start")
       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([]) do |t, (k, v)|
-        t << "-  #{k}: #{k.to_s =~ /pass/ ? '****' : (v.respond_to?(:each) ? v.inspect : v)}"
-      end
-      log_opts.each { |l| Log.debug(l) }
+      @options.each { |k, v| Log.info("-  #{k}: #{k.to_s =~ /pass/ ? '****' : (v.respond_to?(:each) ? v.inspect : v)}") }
 
       begin
         # Capture process id in file after optional daemonize
@@ -495,7 +491,7 @@ module RightScale
       if @mode == :http
         stats.merge!(@client.stats(reset))
       else
-        stats["broker"] = @client.stats(reset)
+        stats["brokers"] = @client.stats(reset)
       end
       result = OperationResult.success(stats)
       @last_stat_reset_time = now if reset
@@ -529,7 +525,7 @@ module RightScale
         "request failures"  => @request_failure_stats.all,
         "response failures" => @response_failure_stats.all
       }
-      unless @mode == :http
+      if @mode != :http
         stats["connect requests"] = @connect_request_stats.all
         stats["non-deliveries"] = @non_delivery_stats.all
       end
@@ -610,7 +606,7 @@ module RightScale
         load_actors
         setup_traps
         setup_status
-        unless @mode == :http
+        if @mode != :http
           setup_non_delivery
           setup_queues
         end
@@ -731,7 +727,7 @@ module RightScale
         Dir["#{dir}/*.rb"].each do |file|
           actor = File.basename(file, ".rb")
           next if actors && !actors.include?(actor)
-          Log.info("[setup] loading actor #{file}")
+          Log.info("[setup] Loading actor #{file}")
           require file
           actors.delete(actor)
         end
@@ -740,7 +736,7 @@ module RightScale
 
       # Perform agent-specific initialization including actor creation and registration
       if (init_file = AgentConfig.init_file)
-        Log.info("[setup] initializing agent from #{init_file}")
+        Log.info("[setup] Initializing agent from #{init_file}")
         instance_eval(File.read(init_file), init_file)
       else
         Log.error("No agent init.rb file found in init directory of #{AgentConfig.root_dir.inspect}")
@@ -794,12 +790,14 @@ module RightScale
     # true:: Always return true
     def setup_status
       @status = {}
-      if @mode == :http
-        @status = @client.status { |type, state| update_status(type, state) }.dup
-      else
-        @client.connection_status { |state| update_status(:broker, state) }
-        @status[:broker] = :connected
-        @status[:auth] = @auth_client.status { |type, state| update_status(type, state) } if @auth_client
+      if @client
+        if @mode == :http
+          @status = @client.status { |type, state| update_status(type, state) }.dup
+        else
+          @client.connection_status { |state| update_status(:broker, state) }
+          @status[:broker] = :connected
+          @status[:auth] = @auth_client.status { |type, state| update_status(type, state) } if @auth_client
+        end
       end
       true
     end
@@ -976,7 +974,7 @@ module RightScale
     # true:: Always return true
     def setup_status_checks(interval)
       @check_status_count = 0
-      @check_status_brokers = @client.all unless @mode == :http
+      @check_status_brokers = @client.all if @mode != :http
       @check_status_timer = EM::PeriodicTimer.new(interval) { check_status }
       true
     end

data/lib/right_agent/agent_tag_manager.rb

@@ -45,7 +45,7 @@ module RightScale
     # true:: Always return true
     def tags(options = {})
       # TODO remove use of agent identity when fully drop AMQP
-      do_query(nil, @agent.self_href || @agent.identity, options) do |result|
+      do_query(nil, @agent.mode == :http ? @agent.self_href : @agent.identity, options) do |result|
         if result.kind_of?(Hash)
           yield(result.size == 1 ? result.values.first['tags'] : [])
         else
@@ -168,7 +168,12 @@ module RightScale
       agent_check
       payload = {:agent_identity => @agent.identity}
       payload[:tags] = ensure_flat_array_value(tags) unless tags.nil? || tags.empty?
-      payload[:hrefs] = ensure_flat_array_value(hrefs) unless hrefs.nil? || hrefs.empty?
+      # TODO remove use of agent identity when fully drop AMQP
+      if @agent.mode == :http
+        payload[:hrefs] = ensure_flat_array_value(hrefs) unless hrefs.nil? || hrefs.empty?
+      else
+        payload[:agent_ids] = ensure_flat_array_value(hrefs) unless hrefs.nil? || hrefs.empty?
+      end
       request = RightScale::RetryableRequest.new("/router/query_tags", payload, request_options)
       request.callback { |result| yield raw ? request.raw_response : result }
       request.errback do |message|

data/lib/right_agent/clients/auth_client.rb

@@ -154,6 +154,21 @@ module RightScale
       state
     end
 
+    # Set callback for each successful communication excluding health checks
+    # Multiple callbacks are supported
+    #
+    # @yield [] required block executed after successful communication
+    #
+    # @return [TrueClass] always true
+    #
+    # @raise [ArgumentError] block missing
+    def communicated(&callback)
+      raise ArgumentError, "Block missing" unless callback
+      @communicated_callbacks ||= []
+      @communicated_callbacks << callback
+      true
+    end
+
     # Current statistics for this client
     #
     # @param [Boolean] reset the statistics after getting the current ones

data/lib/right_agent/clients/base_retry_client.rb

@@ -88,7 +88,6 @@ module RightScale
       @auth_client = auth_client
       @http_client = nil
       @status_callbacks = []
-      @communicated_callbacks = []
       @options = options.dup
       @options[:server_name] ||= type.to_s
       @options[:open_timeout] ||= DEFAULT_OPEN_TIMEOUT
@@ -122,8 +121,12 @@ module RightScale
     # @yield [] required block executed after successful communication
     #
     # @return [TrueClass] always true
+    #
+    # @raise [ArgumentError] block missing
     def communicated(&callback)
-      @communicated_callbacks << callback if callback
+      raise ArgumentError, "Block missing" unless callback
+      @communicated_callbacks ||= []
+      @communicated_callbacks << callback
       true
     end
 
@@ -350,7 +353,7 @@ module RightScale
           request_uuid ? retry : raise
         end
       end
-      @communicated_callbacks.each { |callback| callback.call }
+      @communicated_callbacks.each { |callback| callback.call } if @communicated_callbacks
       result
     end
 

data/lib/right_agent/clients/right_http_client.rb

@@ -209,17 +209,18 @@ module RightScale
 
     # Set callback for each successful communication excluding health checks
     #
-    # @param [Symbol] type of server: :api or :router; defaults to all
+    # @param [Array] types of server: :auth, :api, or :router; defaults to all
     #
     # @yield [] required block executed after successful communication
     #
     # @return [TrueClass] always true
     #
     # @raise [RuntimeError] init was not called
-    def communicated(type = nil, &callback)
+    def communicated(types = [], &callback)
       raise RuntimeError, "#{self.class.name}#init was not called" unless @auth
-      @api.communicated(&callback) if @api && [nil, :api].include?(type)
-      @router.communicated(&callback) if @router && [nil, :router].include?(type)
+      @auth.communicated(&callback) if types.empty? || types.include?(:auth)
+      @api.communicated(&callback) if @api && (types.empty? || types.include?(:api))
+      @router.communicated(&callback) if @router && (types.empty? || types.include?(:router))
       true
     end
 

data/lib/right_agent/clients/router_client.rb

@@ -397,6 +397,7 @@ module RightScale
             Log.info("Sending EVENT <#{result[:uuid]}> #{result[:type]} #{result[:path]} to #{result[:from]}")
             @websocket.send(JSON.dump({:event => result, :routing_keys => [event[:from]]}))
           end
+          @communicated_callbacks.each { |callback| callback.call } if @communicated_callbacks
         rescue Exception => e
           Log.error("Failed handling WebSocket event", e, :trace)
           @stats["exceptions"].track("event", e)
@@ -420,6 +421,7 @@ module RightScale
       begin
         result = long_poll(routing_keys, uuids, &handler)
         @reconnect_interval = RECONNECT_INTERVAL
+        @communicated_callbacks.each { |callback| callback.call } if @communicated_callbacks
       rescue Exceptions::Unauthorized, Exceptions::ConnectivityFailure, Exceptions::RetryableError => e
         Log.error("Failed long-polling", e, :no_trace)
         sleep(backoff_reconnect_interval)

data/lib/right_agent/connectivity_checker.rb

@@ -89,7 +89,7 @@ module RightScale
     # === Return
     # true:: Always return true
     def check(id = nil, max_ping_timeouts = MAX_PING_TIMEOUTS)
-      unless @terminating || @ping_timer || (id && !@sender.client.connected?(id))
+      unless @terminating || @ping_timer || (id && !@sender.agent.client.connected?(id))
         @ping_id = id
         @ping_timer = EM::Timer.new(PING_TIMEOUT) do
           if @ping_id

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.0.7'
-  spec.date      = '2014-02-28'
+  spec.version   = '2.0.8'
+  spec.date      = '2014-03-03'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro', 'Scott Messier']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'
@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency('right_support', ['>= 2.4.1', '< 3.0'])
   spec.add_dependency('right_amqp', '~> 0.7')
-  spec.add_dependency('rest-client', '1.7.0.alpha')
+  spec.add_dependency('rest-client', '1.7.0.1')
   spec.add_dependency('faye-websocket', '0.7.0')
   spec.add_dependency('eventmachine', ['>= 0.12.10', '< 2.0'])
   spec.add_dependency('net-ssh', '~> 2.0')

data/spec/agent_tag_manager_spec.rb

@@ -32,7 +32,7 @@ describe RightScale::AgentTagManager do
     @identity = "rs-agent-1-1"
     @agent_href = "/api/clouds/1/instances/1"
     @agent_href2 = "/api/clouds/2/instances/2"
-    @agent = flexmock("agent", :self_href => @agent_href, :identity => @identity)
+    @agent = flexmock("agent", :self_href => @agent_href, :identity => @identity, :mode => :http).by_default
     @hrefs = [@agent_href, @agent_href2]
     @manager = RightScale::AgentTagManager.instance
     @manager.agent = @agent
@@ -60,6 +60,15 @@ describe RightScale::AgentTagManager do
       @result.should == [@tag]
     end
 
+    it "retrieves current agent tags using agent ID if not in :http mode" do
+      @agent.should_receive(:mode).and_return(:amqp)
+      @retryable_request.should_receive(:new).with("/router/query_tags",
+          {:agent_identity => @identity, :agent_ids => [@identity]}, {}).and_return(@request).once
+      @request.should_receive(:callback).and_yield({@agent_href => {"tags" => [@tag]}}).once
+      @manager.tags { |r| @result = r }
+      @result.should == [@tag]
+    end
+
     it "returns empty array when there is no results hash" do
       @request.should_receive(:callback).and_yield({}).once
       @manager.tags { |r| @result = r }

data/spec/clients/auth_client_spec.rb

@@ -189,6 +189,20 @@ describe RightScale::AuthClient do
     end
   end
 
+  context :communicated do
+    it "stores callback" do
+      callback = lambda { |_, _| }
+      @client.instance_variable_get(:@communicated_callbacks).should be_nil
+      @client.communicated(&callback)
+      @client.instance_variable_get(:@communicated_callbacks).size.should == 1
+      @client.instance_variable_get(:@communicated_callbacks)[0].should == callback
+    end
+
+    it "requires callback block" do
+      lambda { @client.communicated }.should raise_error(ArgumentError, "Block missing")
+     end
+  end
+
   context :check_authorized do
     it "raises retryable error if state is :expired" do
       @client.send(:state=, :authorized)

data/spec/clients/base_retry_client_spec.rb

@@ -136,11 +136,15 @@ describe RightScale::BaseRetryClient do
   context :communicated do
     it "stores callback" do
       callback = lambda { |_, _| }
-      @client.instance_variable_get(:@communicated_callbacks).size.should == 0
+      @client.instance_variable_get(:@communicated_callbacks).should be_nil
       @client.communicated(&callback)
       @client.instance_variable_get(:@communicated_callbacks).size.should == 1
       @client.instance_variable_get(:@communicated_callbacks)[0].should == callback
     end
+
+    it "requires callback block" do
+      lambda { @client.communicated }.should raise_error(ArgumentError, "Block missing")
+     end
   end
 
   context :close do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.alpha
+        version: 1.7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.alpha
+        version: 1.7.0.1
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -405,7 +405,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1817530941733034469
+      hash: -1395793302884247070
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.26