scout_rails 1.0.4.pre → 1.0.4.pre.2

data/CHANGELOG.markdown

@@ -1,6 +1,7 @@
-# 1.0.4
+# 1.0.4.pre
 
 * Added Mongo + Moped instrumentation. Mongo is used for Mongoid < 3.
+* Proxy support
 
 # 1.0.3
 

data/lib/scout_rails/agent.rb

@@ -262,8 +262,7 @@ module ScoutRails
     
     def request(url, &connector)
       response           = nil
-      http               = Net::HTTP.new(url.host, url.port)
-      response           = http.start(&connector)
+      response           = http(url).start(&connector)
       logger.debug "got response: #{response.inspect}"
       case response
       when Net::HTTPSuccess, Net::HTTPNotModified
@@ -279,6 +278,14 @@ module ScoutRails
       response
     end
     
+    # Take care of the http proxy, if specified in config.
+    # 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.
+    def http(url)
+      proxy_uri = URI.parse(config.settings['proxy'].to_s)
+      Net::HTTP::Proxy(proxy_uri.host,proxy_uri.port,proxy_uri.user,proxy_uri.password).new(url.host, url.port)
+    end
+    
     # Loads the instrumention logic.
     def load_instruments
       case environment.framework

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.0.4.pre"
+  VERSION = "1.0.4.pre.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.4.pre
+  version: 1.0.4.pre.2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies: []
 description: Monitors a Ruby on Rails application and reports detailed metrics on
   performance to Scout, a hosted monitoring service.