scout_apm 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c86bce406e281536552a03ab7553cb2f79c40ec7
-  data.tar.gz: a5f327840d2e0325e4b2f284e522ad06ad04c887
+  metadata.gz: 951fb125e1266317ef5b4e0ec486ec3b946be418
+  data.tar.gz: 689544330b9f6a8f1b9f648257dc6eee972432b5
 SHA512:
-  metadata.gz: c0dd0f82b57ef44d53fcb69221c8306caf8f7850541ec160edea79ab6ff3d71434d93b7fec897dae9c7d9f8f337259988631a6642c1168d0ae3d0df82de480fb
-  data.tar.gz: e0a60cb519c43dbf4acadea60873280ffb05f3ec836d55ecdb54863796a166f0b689083f4b7a6a01f5b0d387a98c0bc624e82178098655f70f9bbb9cd51e1c76
+  metadata.gz: b99fc25a5c4af86e600a3f9b1a2a8cb53505e58d1b84468c075fc54a36ad361b36d3f0a4ca717339dfb30aeca344126487783771cd55ef397c79e28bc4a2a076
+  data.tar.gz: d63b8be55f12a1435f1c4f74edad4062cc6d47b3e1e314f0e0cd91a0afa2d0947dbc8a7bae84258cf6df52c5392d65a8a4bf0d5ed50513ebac33a4561cc3eb71

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 1.2.1
+
+* Fix a small issue where the middleware that attempts to start the agent could
+  mistakenly detect that the agent was running when in fact it wasn't.
+
 # 1.2.0
 
 * Middleware tracing - Track time in the Rack middleware that Rails sets up

data/lib/scout_apm/agent.rb

@@ -90,7 +90,6 @@ module ScoutApm
 
       return false unless preconditions_met?(options)
 
-
       @started = true
 
       logger.info "Starting monitoring for [#{environment.application_name}]. Framework [#{environment.framework}] App Server [#{environment.app_server}] Background Job Framework [#{environment.background_job_name}]."
@@ -176,9 +175,14 @@ module ScoutApm
       return !environment.forking?
     end
 
+    def background_worker_running?
+      !! @background_worker_thread
+    end
+
     # 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_background_worker
+      logger.info "Not starting background worker, already started" and return if background_worker_running?
       logger.info "Initializing worker thread."
       @background_worker = ScoutApm::BackgroundWorker.new
       @background_worker_thread = Thread.new do

data/lib/scout_apm/middleware.rb

@@ -5,7 +5,7 @@ module ScoutApm
     def initialize(app)
       @app = app
       @attempts = 0
-      @started = ScoutApm::Agent.instance.started?
+      @started = ScoutApm::Agent.instance.started? && ScoutApm::Agent.instance.background_worker_running?
     end
 
     # If we get a web request in, then we know we're running in some sort of app server
@@ -21,7 +21,8 @@ module ScoutApm
     def attempt_to_start_agent
       @attempts += 1
       ScoutApm::Agent.instance.start(:skip_app_server_check => true)
-      @started = ScoutApm::Agent.instance.started?
+      ScoutApm::Agent.instance.start_background_worker
+      @started = ScoutApm::Agent.instance.started? && ScoutApm::Agent.instance.background_worker_running?
     rescue => e
       # Can't be sure of any logging here, so fall back to ENV var and STDOUT
       if ENV["SCOUT_LOG_LEVEL"] == "debug"

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest