scout_rails 1.0.1.pre → 1.0.1.pre2

data/CHANGELOG.markdown

@@ -1,6 +1,7 @@
 # 1.0.1.pre
 
 * Unicorn support (requires "preload_app true" in unicorn config file)
+* Fix for Thin detection - ensure it's actually running
 
 # 1.0.0
 

data/README.markdown

@@ -10,7 +10,17 @@ Install the gem:
 
     gem install scout_rails
     
-Signup for a [Scout](https://scoutapp.com) account and copy the config file to RAILS_ROOT/config/scout_rails.yml.
+Signup for a [Scout](https://scoutapp.com) account and copy the config file to `RAILS_ROOT/config/scout_rails.yml`.
+
+Your config file should look like:
+
+    common: &defaults
+      name: YOUR_APPLICATION_NAME
+      key: YOUR_APPLICATION_KEY
+      monitor: true
+
+    production:
+      <<: *defaults
       
 ## Supported Frameworks
 
@@ -27,6 +37,7 @@ Signup for a [Scout](https://scoutapp.com) account and copy the config file to R
 * Phusion Passenger
 * Thin
 * WEBrick
+* Unicorn (make sure to add `preload_app true` to `config/unicorn.rb`)
 
 ## Help
 

data/lib/scout_rails/agent.rb

@@ -66,8 +66,8 @@ module ScoutRails
       start_instruments
       if !start_worker_thread?
         logger.debug "Not starting worker thread"
-        install_passenger_worker_process_event if environment.passenger?
-        install_unicorn_worker_loop if environment.unicorn?
+        install_passenger_worker_process_event if environment.app_server == :passenger
+        install_unicorn_worker_loop if environment.app_server == :unicorn
         return
       end
       start_worker_thread
@@ -108,7 +108,7 @@ module ScoutRails
     # * A supported application server is detected, but it forks (Passenger). In this case, 
     #   the agent is started in the forked process.
     def start_worker_thread?
-      !environment.forking? or environment.thin?
+      !environment.forking? or environment.app_server == :thin
     end
     
     def install_passenger_worker_process_event

data/lib/scout_rails/environment.rb

@@ -47,7 +47,19 @@ module ScoutRails
     ### app server related-checks
     
     def thin?
-      defined?(::Thin) && defined?(::Thin::Server)
+      if defined?(::Thin) && defined?(::Thin::Server)
+        # Ensure Thin is actually initialized. It could just be required and not running.
+        ObjectSpace.each_object(Thin::Server) { |x| return true }
+        false
+      end
+    end
+    
+    def unicorn?
+      if defined?(::Unicorn) && defined?(::Unicorn::HttpServer)
+        # Ensure Unicorn is actually initialized. It could just be required and not running.
+        ObjectSpace.each_object(::Unicorn::HttpServer) { |x| return true }
+        false
+      end
     end
     
     # Called via +#forking?+ since Passenger forks. Adds an event listener to start the worker thread

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.0.1.pre"
+  VERSION = "1.0.1.pre2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1.pre
+  version: 1.0.1.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-18 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.