scout_rails 1.0.0 → 1.0.1.pre

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.0.1.pre
+
+* Unicorn support (requires "preload_app true" in unicorn config file)
+
 # 1.0.0
 
 Release!

data/lib/scout_rails/agent.rb

@@ -50,6 +50,7 @@ module ScoutRails
     def start(options = {})
       @options.merge!(options)
       init_logger
+      logger.info "Attempting to start Scout Agent [#{ScoutRails::VERSION}] on [#{Socket.gethostname}]"
       if !config.settings['monitor'] and !@options[:force]
         logger.warn "Monitoring isn't enabled for the [#{environment.env}] environment."
         return false
@@ -66,11 +67,12 @@ module ScoutRails
       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?
         return
       end
       start_worker_thread
       handle_exit
-      log_version_pid
+      logger.info "Scout Agent [#{ScoutRails::VERSION}] Initialized"
     end
     
     # Placeholder: store metrics locally on exit so those in memory aren't lost. Need to decide
@@ -116,8 +118,15 @@ module ScoutRails
       end
     end
     
-    def log_version_pid
-      logger.info "Scout Agent [#{ScoutRails::VERSION}] Initialized"
+    def install_unicorn_worker_loop
+      logger.debug "Installing Unicorn worker loop."
+      Unicorn::HttpServer.class_eval do
+        old = instance_method(:worker_loop)
+        define_method(:worker_loop) do |worker|
+          ScoutRails::Agent.instance.start_worker_thread
+          old.bind(self).call(worker)
+        end
+      end
     end
     
     def log_path
@@ -131,7 +140,7 @@ module ScoutRails
     
     # Creates the worker thread. The worker thread is a loop that runs continuously. It sleeps for +Agent#period+ and when it wakes,
     # processes data, either saving it to disk or reporting to Scout.
-    def start_worker_thread(connection_options = {})
+    def start_worker_thread
       logger.debug "Creating worker thread."
       @worker_thread = Thread.new do
         begin

data/lib/scout_rails/environment.rb

@@ -39,6 +39,7 @@ module ScoutRails
       @app_server ||= if thin? then :thin
                     elsif passenger? then :passenger
                     elsif webrick? then :webrick
+                    elsif unicorn? then :unicorn
                     else nil
                     end
     end
@@ -60,10 +61,17 @@ module ScoutRails
       defined?(::WEBrick) && defined?(::WEBrick::VERSION)
     end
     
+    def unicorn?
+      if defined?(::Unicorn) && defined?(::Unicorn::HttpServer)
+        # ensure Unicorn is actually initialized. 
+        ObjectSpace.each_object(::Unicorn::HttpServer) { |x| return true }
+      end
+    end
+    
     # If forking, don't start worker thread in the master process. Since it's started as a Thread, it won't survive
     # the fork. 
     def forking?
-      passenger?
+      passenger? or unicorn?
     end
     
     ### ruby checks

data/lib/scout_rails/version.rb

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

metadata

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