scout_apm 0.9.7.pre2 → 0.9.7.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aec62477f0a794720ae3147888ae6525f3c5fcd
-  data.tar.gz: 0348a870ef42aebc7a2ef2a5c82488d5c93e489b
+  metadata.gz: 25aab00b1c404c8862106f78cf50c6c1d8858c0a
+  data.tar.gz: 93f051bfce0749e1706ac6eb9f869c7b5c1020d9
 SHA512:
-  metadata.gz: f8625d4209e97a51f1411e39689887841670653546d3ad281a6d1eccbb1f5429ee74249439a0c519beb74f84feee0510772889d0bbff9f379e2bf95003716989
-  data.tar.gz: 1d3c8307e2f34b95fe13a00e77a2a22edc786efcf8a60bc5c3bfba54779ec911e20ca3ce3b59b834e379b49be619e6c92680bbc5ad87f0b4d0c5ce105d85468f
+  metadata.gz: c909c0c8dd205dbb7602e2be3bda38d25a52c08e7bc4ac50839285ef01e24379de8aa154f6c7b561931ad3a35a6d8ac722c4c1544c778d60d6b745e8554bc3d1
+  data.tar.gz: 10769f5a0057b7ee12ab17629541861fe142739620d913e8f735eb2fad63f157ed815eeb27692f47281badd46c7ad765a10d631cbbdc6df046ee31dea3a3fc71

data/lib/scout_apm/middleware.rb

@@ -5,7 +5,7 @@ module ScoutApm
     def initialize(app)
       @app = app
       @attempts = 0
-      @started = false
+      @started = ScoutApm::Agent.instance.started?
     end
 
     # If we get a web request in, then we know we're running in some sort of app server
@@ -13,18 +13,19 @@ module ScoutApm
       if @started || @attempts > MAX_ATTEMPTS
         @app.call(env)
       else
-        begin
-          @attempts += 1
-          ScoutApm::Agent.instance.start(:skip_app_server_check => true)
-          @started = ScoutApm::Agent.instance.started?
-        rescue => e
-          # Can't be sure of any logging here, so fall back to ENV var and STDOUT
-          if ENV["SCOUT_LOG_LEVEL"] == "debug"
-            STDOUT.puts "Failed to start via Middleware: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
-          end
-        ensure
-          @app.call(env)
-        end
+        attempt_to_start_agent
+        @app.call(env)
+      end
+    end
+
+    def attempt_to_start_agent
+      @attempts += 1
+      ScoutApm::Agent.instance.start(:skip_app_server_check => true)
+      @started = ScoutApm::Agent.instance.started?
+    rescue => e
+      # Can't be sure of any logging here, so fall back to ENV var and STDOUT
+      if ENV["SCOUT_LOG_LEVEL"] == "debug"
+        STDOUT.puts "Failed to start via Middleware: #{e.message}\n\t#{e.backtrace.join("\n\t")}"
       end
     end
   end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "0.9.7.pre2"
+  VERSION = "0.9.7.pre3"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 0.9.7.pre2
+  version: 0.9.7.pre3
 platform: ruby
 authors:
 - Derek Haynes