scout_rails 1.1.0 → 1.1.1.pre

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 1.1.1
+
+* Adjusting ordering of app server detection.
+* Changing Passenger detection to look for ::PhusionPassenger vs. ::IN_PHUSION_PASSENGER.
+
 # 1.1.0
 
 * Limiting the size of the transaction hash to 100 metrics to prevent large transaction samples.

data/lib/scout_rails/environment.rb

@@ -51,12 +51,22 @@ module ScoutRails
       end
     end
     
+    # This needs to be improved. Frequently, multiple app servers gem are present and which
+    # ever is checked first becomes the designated app server. 
+    # 
+    # I've put Thin and Webrick last as they are often used in development and included in Gemfiles 
+    # but less likely used in production. 
+    #
+    # Next step: (1) list out all detected app servers (2) install hooks for those that need it (passenger, rainbows, unicorn). 
+    #
+    # Believe the biggest downside is the master process for forking app servers will get a background worker. Not sure how this will
+    # impact metrics (it shouldn't process requests). 
     def app_server
-      @app_server ||= if thin? then :thin
-                    elsif passenger? then :passenger
-                    elsif webrick? then :webrick
+      @app_server ||= if passenger? then :passenger
                     elsif rainbows? then :rainbows
                     elsif unicorn? then :unicorn
+                    elsif thin? then :thin
+                    elsif webrick then :webrick
                     else nil
                     end
     end
@@ -75,7 +85,7 @@ module ScoutRails
     # inside the passenger worker process.
     # Background: http://www.modrails.com/documentation/Users%20guide%20Nginx.html#spawning%5Fmethods%5Fexplained
     def passenger?
-      (defined?(::Passenger) && defined?(::Passenger::AbstractServer)) || defined?(::IN_PHUSION_PASSENGER)
+      (defined?(::Passenger) && defined?(::Passenger::AbstractServer)) || defined?(::PhusionPassenger)
     end
     
     def webrick?

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.1.0"
+  VERSION = "1.1.1.pre"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.1.1.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Derek Haynes
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-01-29 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.
@@ -65,9 +65,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: scout_rails
 rubygems_version: 1.8.10