right_agent 0.5.10 → 0.6.0

data/lib/right_agent/agent.rb

@@ -69,6 +69,7 @@ module RightScale
       :retry_timeout      => nil,
       :connect_timeout    => 60,
       :reconnect_interval => 60,
+      :offline_queueing   => false,
       :ping_interval      => 0,
       :check_interval     => 5 * 60,
       :grace_timeout      => 30,
@@ -100,6 +101,9 @@ module RightScale
     #     by the receiver, 0 means never expire, defaults to 0
     #   :connect_timeout(Integer):: Number of seconds to wait for a broker connection to be established
     #   :reconnect_interval(Integer):: Number of seconds between broker reconnect attempts
+    #   :offline_queueing(Boolean):: Whether to queue request if currently not connected to any brokers,
+    #     also requires agent invocation of Sender initialize_offline_queue and start_offline_queue methods,
+    #     as well as enable_offline_mode and disable_offline_mode as broker connections status changes
     #   :ping_interval(Integer):: Minimum number of seconds since last message receipt to ping the mapper
     #     to check connectivity, defaults to 0 meaning do not ping
     #   :check_interval(Integer):: Number of seconds between publishing stats and checking for broker connections

data/lib/right_agent/agent_config.rb

@@ -177,7 +177,8 @@ module RightScale
     # All security files matching pattern
     #
     # === Parameters
-    # pattern(String):: Pattern for security files of interest, e.g., '*.cert'
+    # pattern(String):: Pattern for security files of interest, e.g., '*.cert' or
+    #   '*.{cert,key}'
     #
     # === Return
     # files(Array):: Path name of files found

data/lib/right_agent/core_payload_types/login_user.rb

@@ -28,7 +28,8 @@ module RightScale
 
     include Serializable
 
-    attr_accessor :uuid, :username, :public_key, :public_keys, :common_name, :superuser, :expires_at
+    attr_accessor :uuid, :username, :public_key, :public_keys, :common_name,
+                  :superuser, :expires_at, :home_archive_url
 
     # Initialize fields from given arguments
     def initialize(*args)
@@ -39,6 +40,7 @@ module RightScale
       @superuser   = args[4] || false
       @expires_at  = Time.at(args[5]) if args[5] && (args[5] != 0) # nil -> 0 because of expires_at.to_i below
       @public_keys = args[6]
+      @home_archive_url = args[7]
 
       # we now expect an array of public_keys to be passed while supporting the
       # singular public_key as a legacy member. when serialized back from a
@@ -55,7 +57,7 @@ module RightScale
 
     # Array of serialized fields given to constructor
     def serialized_members
-      [ @uuid, @username, @public_key, @common_name, @superuser, @expires_at.to_i, @public_keys ]
+      [ @uuid, @username, @public_key, @common_name, @superuser, @expires_at.to_i, @public_keys, @home_archive_url ]
     end
 
   end

data/lib/right_agent/monkey_patches/amqp_patch.rb

@@ -28,6 +28,9 @@ begin
       begin
         EM.run{
           @conn ||= connect *args
+          @conn.callback { AMQP.channel = AMQP::Channel.new(@conn) }
+
+          # callback passed to .start must come last
           @conn.callback(&blk) if blk
           @conn
         }
@@ -50,6 +53,7 @@ begin
 
       timeout @settings[:timeout] if @settings[:timeout]
       errback{ @on_disconnect.call } unless @reconnecting
+      @connection_status = @settings[:connection_status]
 
       # TCP connection "openness"
       @tcp_connection_established = false
@@ -158,11 +162,19 @@ begin
   # Exchange)
   AMQP::Queue.class_eval do
     def initialize(mq, name, opts = {}, &block)
+      raise ArgumentError, "queue name must not be nil. Use '' (empty string) for server-named queues." if name.nil?
+
       @mq = mq
       @opts = self.class.add_default_options(name, opts, block)
       @bindings ||= {}
-      @name = name unless name.empty?
       @status = @opts[:nowait] ? :unknown : :unfinished
+
+      if name.empty?
+        @mq.queues_awaiting_declare_ok.push(self)
+      else
+        @name = name
+      end
+
       unless opts[:no_declare]
         @mq.callback{
           @mq.send AMQP::Protocol::Queue::Declare.new(@opts)

data/lib/right_agent/sender.rb

@@ -545,7 +545,8 @@ module RightScale
     #     message(Packet):: Message being processed
     #     agent(Agent):: Reference to agent
     #   :offline_queueing(Boolean):: Whether to queue request if currently not connected to any brokers,
-    #     also requires agent invocation of initialize_offline_queue and start_offline_queue methods below
+    #     also requires agent invocation of initialize_offline_queue and start_offline_queue methods below,
+    #     as well as enable_offline_mode and disable_offline_mode as broker connections status changes
     #   :ping_interval(Integer):: Minimum number of seconds since last message receipt to ping the mapper
     #     to check connectivity, defaults to 0 meaning do not ping
     #   :restart_callback(Proc):: Callback that is activated on each restart vote with votes being initiated

data/right_agent.gemspec

@@ -24,7 +24,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '0.5.10'
+  spec.version   = '0.6.0'
   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.require_path = 'lib'
 
   spec.add_dependency('right_support', '~> 1.0')
-  spec.add_dependency('amqp', '0.7.1')
+  spec.add_dependency('amqp', '0.7.5')
   spec.add_dependency('json', ['~> 1.4'])
   spec.add_dependency('eventmachine', '~> 0.12.10')
   spec.add_dependency('right_popen', '~> 1.0.11')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_agent
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 10
-  version: 0.5.10
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -17,11 +17,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 -07:00
+date: 2011-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  name: right_support
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,28 +34,28 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  name: right_support
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: amqp
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 9
         segments: 
         - 0
         - 7
-        - 1
-        version: 0.7.1
-  name: amqp
+        - 5
+        version: 0.7.5
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: json
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,12 +65,12 @@ dependencies:
         - 1
         - 4
         version: "1.4"
-  name: json
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: eventmachine
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,12 +81,12 @@ dependencies:
         - 12
         - 10
         version: 0.12.10
-  name: eventmachine
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: right_popen
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +97,12 @@ dependencies:
         - 0
         - 11
         version: 1.0.11
-  name: right_popen
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: msgpack
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -110,10 +113,7 @@ dependencies:
         - 4
         - 4
         version: 0.4.4
-  name: msgpack
-  prerelease: false
-  type: :runtime
-  version_requirements: *id006
+  requirement: *id006
 description: |
   RightAgent provides a foundation for running an agent on a server to interface
   in a secure fashion with other agents in the RightScale system. A RightAgent