right_agent 2.4.6 → 2.5.0

data/lib/right_agent/agent.rb

@@ -676,12 +676,10 @@ module RightScale
       when "Push"
         packet = RightScale::Push.new(event[:path], event[:data], {:from => event[:from], :token => event[:uuid]})
         packet.expires_at = event[:expires_at].to_i if event.has_key?(:expires_at)
-        packet.skewed_by = event[:skewed_by].to_i if event.has_key?(:skewed_by)
       when "Request"
         options = {:from => event[:from], :token => event[:uuid], :reply_to => event[:reply_to], :tries => event[:tries]}
         packet = RightScale::Request.new(event[:path], event[:data], options)
         packet.expires_at = event[:expires_at].to_i if event.has_key?(:expires_at)
-        packet.skewed_by = event[:skewed_by].to_i if event.has_key?(:skewed_by)
       end
       packet
     end

data/lib/right_agent/clients/router_client.rb

@@ -462,10 +462,19 @@ module RightScale
       @attempted_connect_at = Time.now
       @close_code = @close_reason = nil
 
+      # Initialize use of proxy if defined
+      if (v = BalancedHttpClient::PROXY_ENVIRONMENT_VARIABLES.detect { |v| ENV.has_key?(v) })
+        proxy_uri = ENV[v].match(/^[[:alpha:]]+:\/\//) ? URI.parse(ENV[v]) : URI.parse("http://" + ENV[v])
+        @proxy = { :origin => proxy_uri.to_s }
+      end
+
       options = {
         # Limit to .auth_header here (rather than .headers) to keep WebSockets happy
         :headers => {"X-API-Version" => API_VERSION}.merge(@auth_client.auth_header),
         :ping => @options[:listen_timeout] }
+
+      options[:proxy] = @proxy if @proxy
+
       url = URI.parse(@auth_client.router_url)
       url.scheme = url.scheme == "https" ? "wss" : "ws"
       url.path = url.path + "/connect"

data/lib/right_agent/offline_handler.rb

@@ -168,7 +168,6 @@ module RightScale
     # token(String):: Token uniquely identifying request
     # expires_at(Integer):: Time in seconds in Unix-epoch when this request expires and
     #   is to be ignored by the receiver; value 0 means never expire
-    # skewed_by(Integer):: Amount of skew already applied to expires_at in seconds
     #
     # === Block
     # Optional block used to process response asynchronously with the following parameter:
@@ -176,10 +175,9 @@ module RightScale
     #
     # === Return
     # true:: Always return true
-    def queue_request(kind, type, payload, target, token, expires_at, skewed_by, &callback)
+    def queue_request(kind, type, payload, target, token, expires_at, &callback)
       request = {:kind => kind, :type => type, :payload => payload, :target => target,
-                 :token => token, :expires_at => expires_at, :skewed_by => skewed_by,
-                 :callback => callback}
+                 :token => token, :expires_at => expires_at, :callback => callback}
       Log.info("[offline] Queuing request: #{request.inspect}")
       vote_to_restart if (@restart_vote_count += 1) >= MAX_QUEUED_REQUESTS
       if @state == :initializing

data/lib/right_agent/packets.rb

@@ -285,7 +285,7 @@ module RightScale
   class Request < Packet
 
     attr_accessor :from, :scope, :payload, :type, :token, :reply_to, :selector, :target, :persistent, :expires_at,
-                  :skewed_by, :tags, :tries
+                  :tags, :tries
 
     DEFAULT_OPTIONS = {:selector => :any}
 
@@ -306,7 +306,6 @@ module RightScale
     #     by the AMQP broker
     #   :expires_at(Integer|nil):: Time in seconds in Unix-epoch when this request expires and
     #      is to be ignored by the receiver; value 0 means never expire; defaults to 0
-    #   :skewed_by(Integer|nil):: Amount of skew already applied to expires_at in seconds
     #   :tags(Array(Symbol)):: List of tags to be used for selecting target for this request
     #   :tries(Array):: List of tokens for previous attempts to send this request
     # version(Array):: Protocol version of the original creator of the packet followed by the
@@ -325,7 +324,6 @@ module RightScale
       @target     = opts[:target]
       @persistent = opts[:persistent]
       @expires_at = opts[:expires_at] || 0
-      @skewed_by  = opts[:skewed_by] || 0
       @tags       = opts[:tags] || []
       @tries      = opts[:tries] || []
       @version    = version
@@ -350,17 +348,16 @@ module RightScale
     def self.create(o)
       i = o['data']
       expires_at = if i.has_key?('created_at')
-                     created_at = i['created_at'].to_i
-                     created_at > 0 ? created_at + (15 * 60) : 0
-                   else
-                     i['expires_at']
-                   end
+        created_at = i['created_at'].to_i
+        created_at > 0 ? created_at + (15 * 60) : 0
+      else
+        i['expires_at']
+      end
       new(i['type'], i['payload'], { :from       => self.compatible(i['from']), :scope      => i['scope'],
                                      :token      => i['token'],                 :reply_to   => self.compatible(i['reply_to']),
                                      :selector   => i['selector'],              :target     => self.compatible(i['target']),
                                      :persistent => i['persistent'],            :tags       => i['tags'],
-                                     :expires_at => expires_at,                 :skewed_by  => i['skewed_by'],
-                                     :tries      => i['tries'] },
+                                     :expires_at => expires_at,                 :tries      => i['tries'] },
           i['version'] || [DEFAULT_VERSION, DEFAULT_VERSION], o['size'])
     end
 
@@ -419,7 +416,7 @@ module RightScale
   class Push < Packet
 
     attr_accessor :from, :scope, :payload, :type, :token, :selector, :target, :persistent, :confirm,
-                  :expires_at, :skewed_by, :tags
+                  :expires_at, :tags
 
     DEFAULT_OPTIONS = {:selector => :any}
 
@@ -440,7 +437,6 @@ module RightScale
     #     to which request was published but not necessarily delivered
     #   :expires_at(Integer|nil):: Time in seconds in Unix-epoch when this request expires and
     #      is to be ignored by the receiver; value 0 means never expire; defaults to 0
-    #   :skewed_by(Integer|nil):: Amount of skew already applied to expires_at in seconds
     #   :tags(Array(Symbol)):: List of tags to be used for selecting target for this request
     # version(Array):: Protocol version of the original creator of the packet followed by the
     #   protocol version of the packet contents to be used when sending
@@ -458,7 +454,6 @@ module RightScale
       @persistent = opts[:persistent]
       @confirm    = opts[:confirm]
       @expires_at = opts[:expires_at] || 0
-      @skewed_by  = opts[:skewed_by] || 0
       @tags       = opts[:tags] || []
       @version    = version
       @size       = size
@@ -490,11 +485,11 @@ module RightScale
     # (Push):: New packet
     def self.create(o)
       i = o['data']
-      new(i['type'], i['payload'], { :from      => self.compatible(i['from']),   :scope      => i['scope'],
-                                     :token     => i['token'],                   :selector   => i['selector'],
-                                     :target    => self.compatible(i['target']), :persistent => i['persistent'],
-                                     :confirm   => i['confirm'],                 :expires_at => i['expires_at'],
-                                     :skewed_by => i['skewed_by'],               :tags       => i['tags'] },
+      new(i['type'], i['payload'], { :from    => self.compatible(i['from']),   :scope      => i['scope'],
+                                     :token   => i['token'],                   :selector   => i['selector'],
+                                     :target  => self.compatible(i['target']), :persistent => i['persistent'],
+                                     :confirm => i['confirm'],                 :expires_at => i['expires_at'],
+                                     :tags    => i['tags']},
           i['version'] || [DEFAULT_VERSION, DEFAULT_VERSION], o['size'])
     end
 

data/lib/right_agent/sender.rb

@@ -346,7 +346,7 @@ module RightScale
       end
 
       if queueing?
-        @offline_handler.queue_request(kind, type, payload, target, packet.token, packet.expires_at, packet.skewed_by, &callback)
+        @offline_handler.queue_request(kind, type, payload, target, packet.token, packet.expires_at, &callback)
         nil
       else
         packet
@@ -637,7 +637,7 @@ module RightScale
         result = error_result(e.message)
       rescue Exceptions::ConnectivityFailure => e
         if queueing?
-          @offline_handler.queue_request(kind, packet.type, packet.payload, target, packet.token, packet.expires_at, packet.skewed_by, &callback)
+          @offline_handler.queue_request(kind, packet.type, packet.payload, target, packet.token, packet.expires_at, &callback)
           result = nil
         else
           result = retry_result(e.message)
@@ -696,7 +696,7 @@ module RightScale
       rescue TemporarilyOffline => e
         if queueing?
           # Queue request until come back online
-          @offline_handler.queue_request(kind, packet.type, packet.payload, target, packet.token, packet.expires_at, packet.skewed_by, &callback)
+          @offline_handler.queue_request(kind, packet.type, packet.payload, target, packet.token, packet.expires_at, &callback)
           @pending_requests.delete(packet.token) if callback
         else
           # Send retry response so that requester, e.g., RetryableRequest, can retry

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.4.6'
-  spec.date      = '2015-09-16'
+  spec.version   = '2.5.0'
+  spec.date      = '2015-02-24'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro', 'Scott Messier']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'
@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency('right_support', ['>= 2.4.1', '< 3.0'])
   spec.add_dependency('right_amqp', '~> 0.8')
   spec.add_dependency('rest-client', '~> 1.7.0.3')
-  spec.add_dependency('faye-websocket', '~> 0.7.0')
+  spec.add_dependency('faye-websocket', '~> 0.8.0')
   spec.add_dependency('eventmachine', ['>= 0.12.10', '< 2.0'])
   spec.add_dependency('net-ssh', '~> 2.0')
 

data/spec/offline_handler_spec.rb

@@ -196,15 +196,14 @@ describe RightScale::OfflineHandler do
       @now = Time.now
       flexmock(Time).should_receive(:now).and_return(@now)
       @expires_at = @now + 25
-      @skewed_by = 1
       @callback = lambda { |_| }
     end
 
     it "queues request at head of queue if still initializing" do
       @handler.init
-      @handler.queue_request(@kind, @type, @payload, "target1", "token1", @expires_at, @skewed_by, &@callback).should be_true
+      @handler.queue_request(@kind, @type, @payload, "target1", "token1", @expires_at, &@callback).should be_true
       @handler.queue.size.should == 1
-      @handler.queue_request(@kind, @type, @payload, "target2", "token2", @expires_at, @skewed_by, &@callback).should be_true
+      @handler.queue_request(@kind, @type, @payload, "target2", "token2", @expires_at, &@callback).should be_true
       @handler.queue.size.should == 2
       @handler.queue.first[:target] == "target2"
     end
@@ -212,9 +211,9 @@ describe RightScale::OfflineHandler do
     it "queues request at end of queue if no longer initializing" do
       @handler.init
       @handler.start
-      @handler.queue_request(@kind, @type, @payload, "target1", "token1", @expires_at, @skewed_by, &@callback)
+      @handler.queue_request(@kind, @type, @payload, "target1", "token1", @expires_at, &@callback)
       @handler.queue.size.should == 1
-      @handler.queue_request(@kind, @type, @payload, "target2", "token2", @expires_at, @skewed_by, &@callback)
+      @handler.queue_request(@kind, @type, @payload, "target2", "token2", @expires_at, &@callback)
       @handler.queue.size.should == 2
       @handler.queue.first[:target] == "target1"
     end
@@ -224,7 +223,7 @@ describe RightScale::OfflineHandler do
       @handler.start
       flexmock(@handler).should_receive(:vote_to_restart).once
       RightScale::OfflineHandler::MAX_QUEUED_REQUESTS.times do |i|
-        @handler.queue_request(@kind, @type, @payload, @target, @token, @expires_at, @skewed_by, &@callback)
+        @handler.queue_request(@kind, @type, @payload, @target, @token, @expires_at, &@callback)
       end
     end
   end
@@ -250,7 +249,6 @@ describe RightScale::OfflineHandler do
       @now = Time.now
       flexmock(Time).should_receive(:now).and_return(@now)
       @expires_at = (@now + 25).to_i
-      @skewed_by = 1
       @result = nil
       @callback = lambda { |result| @result = result }
     end
@@ -261,9 +259,9 @@ describe RightScale::OfflineHandler do
         @handler.start
         flexmock(@handler).should_receive(:start_timer)
         @handler.enable
-        @handler.queue_request(:send_push, @type, @payload, @target, @token, 0, 0)
-        @handler.queue_request(:send_request, @type, @payload, @target, @token, @expires_at, @skewed_by, &@callback)
-        @handler.queue_request(:send_request, @type, @payload, @target, @token, @now.to_i, @skewed_by, &@callback)
+        @handler.queue_request(:send_push, @type, @payload, @target, @token, 0)
+        @handler.queue_request(:send_request, @type, @payload, @target, @token, @expires_at, &@callback)
+        @handler.queue_request(:send_request, @type, @payload, @target, @token, @now.to_i, &@callback)
         @handler.queue.size.should == 3
         flexmock(EM).should_receive(:next_tick).and_yield.twice
         @sender.should_receive(:send_push).with(@type, @payload, @target, {:token => @token}).once.ordered

data/spec/sender_spec.rb

@@ -427,7 +427,7 @@ describe RightScale::Sender do
             @sender = create_sender(:http, :offline_queueing => true)
             flexmock(@sender.offline_handler).should_receive(:queueing?).and_return(true)
             flexmock(@sender.offline_handler).should_receive(:queue_request).
-                with(kind, @type, @payload, @target, @token, (@now + @ttl).to_i, 0, @callback).once
+                with(kind, @type, @payload, @target, @token, (@now + @ttl).to_i, @callback).once
             @sender.build_packet(kind, @type, @payload, @target, @options, &@callback).should be nil
           end
         end
@@ -779,7 +779,7 @@ describe RightScale::Sender do
               @sender.enable_offline_mode
               @client.should_receive(:request).and_raise(RightScale::Exceptions::ConnectivityFailure, "disconnected").once
               flexmock(@sender.offline_handler).should_receive(:queue_request).
-                  with(:send_push, @type, @payload, @target, @token, (@now + @ttl).to_i, 0).once
+                  with(:send_push, @type, @payload, @target, @token, (@now + @ttl).to_i).once
               flexmock(@sender).should_receive(:handle_response).never
               @sender.send(:http_send_once, :send_push, @target, @packet, @received_at).should be_true
             end
@@ -792,7 +792,7 @@ describe RightScale::Sender do
               @sender.enable_offline_mode
               @client.should_receive(:request).and_raise(RightScale::Exceptions::ConnectivityFailure, "disconnected").once
               flexmock(@sender.offline_handler).should_receive(:queue_request).
-                  with(:send_request, @type, @payload, @target, @token, (@now + @ttl).to_i, 0, @callback).once
+                  with(:send_request, @type, @payload, @target, @token, (@now + @ttl).to_i, @callback).once
               flexmock(@sender).should_receive(:handle_response).never
               @sender.send(:http_send_once, :send_request, @target, @packet, @received_at, &@callback).should be_true
             end
@@ -886,7 +886,7 @@ describe RightScale::Sender do
               @sender.initialize_offline_queue
               @sender.enable_offline_mode
               flexmock(@sender.offline_handler).should_receive(:queue_request).
-                  with(:send_push, @type, @payload, @target, @token, (@now + @ttl).to_i, 0).once
+                  with(:send_push, @type, @payload, @target, @token, (@now + @ttl).to_i).once
               flexmock(@sender).should_receive(:amqp_send_once).and_raise(RightScale::Sender::TemporarilyOffline).once
               @sender.send(:amqp_send, :send_push, @target, @packet, @received_at).should be_true
               @sender.pending_requests[@token].should be_nil

data/spec/spec_helper.rb

@@ -103,5 +103,5 @@ def version_can_handle_msgpack_result; 12 end
 def version_cannot_handle_non_delivery_result; 12 end
 def version_can_handle_non_delivery_result; 13 end
 
-def version_cannot_handle_http_result; 22 end
-def version_can_handle_http_result; 23 end
+def version_cannot_handle_http; 22 end
+def version_can_handle_http; 23 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Lee Kirchhoff
@@ -11,164 +12,194 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.1
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: right_amqp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.0.3
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.10
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.10
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-description: |
-  RightAgent provides a foundation for running an agent on a server to interface
+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 using RightNet,
+
   which operates in either HTTP or AMQP mode. When using HTTP, RightAgent
+
   makes requests to RightApi servers and receives requests using long-polling or
+
   WebSockets via the RightNet router. To respond to requests it posts to the
+
   HTTP router. When using AMQP, RightAgent uses RabbitMQ as the message bus and
+
   the RightNet router as the routing node to make requests; to receives requests
+
   routed to it by the RightNet router, it establishes a queue on startup. The
+
   packets are structured to invoke services in the agent represented by actors
+
   and methods. The RightAgent may respond to these requests with a result packet
+
   that the router then routes to the originator.
+
+'
 email: lee@rightscale.com
 executables: []
 extensions: []
@@ -362,29 +393,33 @@ files:
 - spec/tracer_spec.rb
 homepage: https://github.com/rightscale/right_agent
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
-- "--main"
+- --main
 - README.rdoc
-- "--title"
+- --title
 - RightAgent
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1759897669862666077
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 1.8.26
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Agent for interfacing server with RightScale system
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8180837ab6a7f6c7ad3368c26feafb8718dcca20
-  data.tar.gz: 7a32eab4484c4d5bb46c150813caa1a9ecd46f56
-SHA512:
-  metadata.gz: 1ec91b652cdd3da73329e0618bd27f75d98fa6d0ddc5fa31e6a4680a8ac663c36019bd65a595d636b24005d24b3de2a2ad9640875776d66ac8ca8d822329b3b8
-  data.tar.gz: 28919cf8fc17ca7b23d0c96d05911b7fac92c3b9d14bfb35d616762cbee026e6f64d7a6261cf322ec7833261ae70ec3cb5238bdc791b9d0250c810a1e65f98df