scout_apm 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37dccd68e9841fb4be84b21b542423f4923dfee5
-  data.tar.gz: c29e6ac3d99fbbd612baf124c6e2d76e68933e27
+  metadata.gz: d6e3fc97dff8ae1961d76b52394b1352d0b9ed37
+  data.tar.gz: ec255a3987a94f40a009bb152f07cbc00a6763cc
 SHA512:
-  metadata.gz: 34d1715eff899c93e04962bf4b3e80cc2e448cc4900a591fe180ade13973db7593a32a132d4f8b135298d4030911f580fbe472007d8bb42fc0c639245a48f236
-  data.tar.gz: 0c10d15966c2ac5797dda63978ccde80af58dfa59f584d9ddb63cd39d29de2cf97c7b1e47a22f29ade4952ebe28c2bcb78d4be6c0c6366aabd221aa4417dfa0d
+  metadata.gz: 5d5b03e83afd811e9cf3a9569affdac111e98d78e2668c86bd0ed7cdbca9853e667392f4cb4d6e5820ee9bb3d9841799f9098988dc47e05698f4be87e3d02f52
+  data.tar.gz: 01605ef204077472adec76c6607cecc0d50263faf8ee2b00550d85386b78bda4d2ab5a9edd548b9a2adf97ee2ec8547597e024e0713336bf9ab30d1a75cebc34

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 1.2.10
+
+* Improve exit handler. It wasn't being run during shutdown in some cases.
+
 # 1.2.9
 
 * Uses ActiveRecord::Base.configurations to access database adapter across all versions of Rails 3.0+.

data/lib/scout_apm/agent.rb

@@ -113,7 +113,6 @@ module ScoutApm
       # hook is inserted to start the background worker after forking.
       if start_background_worker?
         start_background_worker
-        handle_exit
         logger.info "Scout Agent [#{ScoutApm::VERSION}] Initialized"
       elsif environment.background_job_integration
         environment.background_job_integration.install
@@ -130,13 +129,25 @@ module ScoutApm
       AppServerLoad.new.run
     end
 
-    def exit_handler_unsupported?
-      environment.sinatra? || environment.jruby? || environment.rubinius?
+    def exit_handler_supported?
+      if environment.sinatra?
+        logger.debug "Exit handler not supported for Sinatra"
+        false
+      elsif environment.jruby?
+        logger.debug "Exit handler not supported for JRuby"
+        false
+      elsif environment.rubinius?
+        logger.debug "Exit handler not supported for Rubinius"
+        false
+      else
+        true
+      end
     end
 
     # at_exit, calls Agent#shutdown to wrapup metric reporting.
-    def handle_exit
-      logger.debug "Exit handler not supported" and return if exit_handler_unsupported?
+    def install_exit_handler
+      logger.debug "Shutdown handler not supported" and return unless exit_handler_supported?
+      logger.debug "Installing Shutdown Handler"
 
       at_exit do
         logger.info "Shutting down Scout Agent"
@@ -193,6 +204,9 @@ module ScoutApm
     def start_background_worker
       logger.info "Not starting background worker, already started" and return if background_worker_running?
       logger.info "Initializing worker thread."
+
+      install_exit_handler
+
       @background_worker = ScoutApm::BackgroundWorker.new
       @background_worker_thread = Thread.new do
         @background_worker.start {

data/lib/scout_apm/environment.rb

@@ -168,7 +168,7 @@ module ScoutApm
     ### framework checks
 
     def sinatra?
-      defined?(Sinatra::Application)
+      framework_integration.name == :sinatra
     end
 
   end # class Environemnt

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.9"
+  VERSION = "1.2.10"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Derek Haynes
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring