scout 5.3.3 → 5.3.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+== Master
+
+== 5.3.4
+
+* Incorporating sleep interval into Server#time_to_checkin?
+* Added proxy support via http_proxy environment variable
+
 == 5.3.3
 
 * Sending embedded options to server for local & plugin overrides.

data/lib/scout/server.rb

@@ -243,7 +243,7 @@ module Scout
     def time_to_checkin?
       @history['last_checkin'] == nil ||
               @directives['interval'] == nil ||
-              (Time.now.to_i - Time.at(@history['last_checkin']).to_i).abs+15 > @directives['interval'].to_i*60
+              (Time.now.to_i - Time.at(@history['last_checkin']).to_i).abs+15+sleep_interval > @directives['interval'].to_i*60
     rescue
       debug "Failed to calculate time_to_checkin. @history['last_checkin']=#{@history['last_checkin']}. "+
               "@directives['interval']=#{@directives['interval']}. Time.now.to_i=#{Time.now.to_i}"
@@ -565,11 +565,17 @@ module Scout
                         HTTP_HEADERS.merge(headers) )
       end
     end
-    
+
     def request(url, response_handler, error, &connector)
       response           = nil
       Timeout.timeout(5 * 60, APITimeoutError) do
-        http               = Net::HTTP.new(url.host, url.port)
+        if p=ENV['http_proxy']
+          info("Using HTTP proxy from ENV['http_proxy']=#{p}")
+          proxy = URI.parse(p)
+          http  = Net::HTTP.proxy(proxy.host,proxy.port).new(url.host, url.port)
+        else
+          http  = Net::HTTP.new(url.host, url.port)
+        end
         if url.is_a? URI::HTTPS
           http.use_ssl     = true
           http.ca_file     = File.join( File.dirname(__FILE__),

data/lib/scout.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby -wKU
 
 module Scout
-  VERSION = "5.3.3".freeze
+  VERSION = "5.3.4".freeze
 end
 
 require "scout/command"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scout
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: 
+  hash: 51
+  prerelease: false
   segments: 
   - 5
   - 3
-  - 3
-  version: 5.3.3
+  - 4
+  version: 5.3.4
 platform: ruby
 authors: 
 - Scout Monitoring
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 -07:00
+date: 2011-12-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: scout
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Scout makes monitoring and reporting on your web applications as flexible and simple as possible.