oboe-heroku 0.9.9.0 → 0.9.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1065da7d1a0f64f619796886b3878e12528b814a
-  data.tar.gz: 7fa251e99d9f6e16672f73a27d6fa0231a10a6d5
+  metadata.gz: cbedf166a398ff97b329a3c9d84cccfbe5b501f6
+  data.tar.gz: 3e7f4fe19d939604ea339cc642f2cd3df56093b9
 SHA512:
-  metadata.gz: af03f9c07f86dd002ebf19f6632dc3f16ade8d9ff9b628bb736d2f6c49aa32e0386b999303774b3570542e7ff23beab63d9ba12fb2ece01ecf63450140759738
-  data.tar.gz: 525626a0924328b46272688aa8599b31d7692a75cfea579001a67209b9c58f464d35652fc294b8650a02f95106b6bcd62db89712c7555933b450f041e53a61f3
+  metadata.gz: 7455e21c7daea4d6609e81dc9a78cf35adf11ee8c9e13ad7de3a356a65ebf5c5ab6b99d600baa97f5fe859773fdf681443f0c23defcb3759810c936588ebd906
+  data.tar.gz: c528320394281553c0ba380856e8f02504db290579d681e9b40131887c5584680f3ac1d044a350409d42c8b9778300f340f5b4b726cc8c55ad740a113b0e0b6e

data/lib/base.rb

@@ -63,7 +63,7 @@ module OboeBase
   end
 
   def forking_webserver?
-    defined?(::Unicorn)
+    (defined?(::Unicorn) and ($0 =~ /unicorn/i)) ? true : false
   end
 
   ##

data/lib/heroku_metal.rb

@@ -19,7 +19,7 @@ module Oboe_metal
 
         evt.addInfo("Backtrace", Oboe::API.backtrace) if with_backtrace
 
-        Oboe.reporter.sendReport(evt)
+        Oboe.reporter.sendReport(evt) if Oboe.loaded
       end
        
       def tracing_layer_op?(operation)
@@ -44,15 +44,21 @@ module Oboe_metal
     #
     def self.start
       begin
+        return unless Oboe.loaded
+
+        if Oboe.reporter
+          Oboe.logger.warn "[oboe/warn] Attempt to start an already started reporter..."
+          return
+        end
+
         Oboe_metal::Context.init()
 
         Oboe.logger.debug "[oboe/debug] Initializing Heroku based reporter."
         
         # The Oboe Reporter is configured via Heroku config variables.
         Oboe.reporter = Oboe::Reporter.new(nil, nil)
-        
-        Oboe::API.report_init
 
+        Oboe::API.report_init
       rescue Exception => e
         $stderr.puts e.message
         raise
@@ -60,7 +66,7 @@ module Oboe_metal
     end
 
     def self.sendReport(evt)
-      Oboe.reporter.sendReport(evt)
+      Oboe.reporter.sendReport(evt) if Oboe.loaded
     end
   end
 end

data/lib/oboe-heroku/version.rb

@@ -2,7 +2,7 @@ module OboeHeroku
   module Version
     MAJOR = 0
     MINOR = 9
-    PATCH = 9
+    PATCH = 10
     BUILD = 0
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lib/oboe-heroku.rb

@@ -2,13 +2,17 @@
 # All rights reserved.
 
 begin
-  if ENV.has_key?('TRACEVIEW_URL')
+  # TRACEVIEW_URL env var is standard with the Heroku addon.  We
+  # use it to determine if we are actually running in Heroku or not.
+  if ENV.has_key?('TRACEVIEW_URL') and ENV['RAILS_GROUP'] != 'assets'
     begin
       require 'heroku_metal'
       require 'oboe_metal.so'
     rescue LoadError => e
+      Oboe.loaded = false
+      
       if ENV.has_key?('TRACEVIEW_DEBUG_LEVEL') and (ENV['TRACEVIEW_DEBUG_LEVEL'].to_i > 1)
-        $stderr.puts "[oboe-heroku/error] Could not load oboe-heroku dependencies: #{e.message}"
+        $stderr.puts "[oboe-heroku/error] Could not load all dependencies: #{e.message}"
         $stderr.puts e.backtrace.join("\n")
       end
     end
@@ -19,10 +23,14 @@ begin
     # Require the core oboe gem
     require 'oboe'
 
-    ::OboeHeroku::Loading.configure
+    ::OboeHeroku::Loading.configure if Oboe.loaded
   end
 rescue Exception => e
+  Oboe.loaded = false
+
   $stderr.puts "[oboe-heroku/error] Problem loading: #{e.message}"
-  $stderr.puts e.backtrace.join("\n")
+  if ENV.has_key?('TRACEVIEW_DEBUG_LEVEL') and (ENV['TRACEVIEW_DEBUG_LEVEL'].to_i > 1)
+    $stderr.puts e.backtrace.join("\n")
+  end
 end
 

data/oboe-heroku.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
    
   s.extensions = ['ext/oboe_metal/extconf.rb']
     
-  s.add_dependency(%q<oboe>, [">= 2.6.1.0"])
+  s.add_dependency(%q<oboe>, [">= 2.6.2.0"])
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe-heroku
 version: !ruby/object:Gem::Version
-  version: 0.9.9.0
+  version: 0.9.10.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oboe
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.6.1.0
+        version: 2.6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.6.1.0
+        version: 2.6.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement