scout 5.5.1 → 5.5.2

data/CHANGELOG

@@ -1,5 +1,9 @@
 == Master
 
+== 5.5.2
+
+* Fixed --http-proxy & --https-proxy support, which were broken in 5.5.0
+
 == 5.5.1
 
 * Updating history on plugin timeouts (last run & memory). Previously, the data from the last successful run was retained.

data/lib/scout/server.rb

@@ -64,7 +64,6 @@ module Scout
         headers["If-Modified-Since"] = @history["plan_last_modified"]
       end
       get(url, "Could not ping #{url} for refresh info", headers) do |res|
-        info "inside 'refresh?' #{res.to_hash.to_json}"
         @streamer_command = res["x-streamer-command"] # usually will be nil, but can be [start,abcd,1234,5678|stop]
         if res.is_a?(Net::HTTPNotModified)
           return false

data/lib/scout/server_base.rb

@@ -53,7 +53,13 @@ module Scout
     def request(url, response_handler, error, &connector)
       response = nil
       Timeout.timeout(5 * 60, APITimeoutError) do
-        http = Net::HTTP.new(url.host, url.port)
+        # take care of http/https proxy, if specified in command line options
+        # Given a blank string, the proxy_uri URI instance's host/port/user/pass will be nil
+        # Net::HTTP::Proxy returns a regular Net::HTTP class if the first argument (host) is nil
+        info "using http_proxy=#{@http_proxy}, https_proxy=#{@https_proxy}" if @http_proxy != '' || @https_proxy != ''
+        proxy_uri = URI.parse(url.is_a?(URI::HTTPS) ? @https_proxy : @http_proxy)
+        http=Net::HTTP::Proxy(proxy_uri.host,proxy_uri.port,proxy_uri.user,proxy_uri.port).new(url.host, url.port)
+
         if url.is_a? URI::HTTPS
           http.use_ssl = true
           http.ca_file = File.join(File.dirname(__FILE__),

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.5.1"
+  VERSION = "5.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 5.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000 Z
+date: 2012-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elif
-  requirement: &2160186240 !ruby/object:Gem::Requirement
+  requirement: &70188519768680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160186240
+  version_requirements: *70188519768680
 description: ! 'Scout makes monitoring and reporting on your web applications as flexible
   and simple as possible.