failbot 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bf1cd8e88ccca089754a6f50a95eee082d6c539
-  data.tar.gz: 1effc1524d589bf0ec7fef6c889d25e6370d3bbf
+  metadata.gz: 590764333f8092a3f705fe2d4a31aa1698e93ea4
+  data.tar.gz: b5442b2100651a2a3bc496844125d2f9292fe393
 SHA512:
-  metadata.gz: b2d57f92ffc7d22d628585737b7237e9e205ac00227ab933c16a0e285079e57de3dfbd2a23423b10bfb37fbaa5531b113b598c270296d572f0e8afdffe429b58
-  data.tar.gz: 5c462f2056572ce7a66cd220179f220f86a0794ae1d0e9f800108f52898262da0919aa175e14935a527a2b5137be5067beb2ac74a3f5dde55770925522fb35a9
+  metadata.gz: 1d80897bbe2ddb19976999f58359bfa64996bc024d104ee5b3892198ddd1d09ad1d47ac2e7fd23b88d467b2e8fc8efc30bd6f65efc55160637a9ea4f1e5cc628
+  data.tar.gz: 20c82ffce7e74252f0565a86cf916e406d0551ca99cf991cd3060bf31a1e73d78a3b7efb1c6cc9a7d5b46456d60c2fc8d122ce3355339bf87a4ac636b64b8672

data/lib/failbot.rb

@@ -210,41 +210,44 @@ module Failbot
 
   def report!(e, other = {})
     return unless @report_errors
-    data = squash_contexts(context, exception_info(e), other)
-
-    if !data.has_key?("rollup")
-      data = data.merge("rollup" => @rollup.call(e, data))
-    end
-
-    if @before_report
-      data = squash_contexts(data, @before_report.call(e, data))
-    end
-
-    if @app_override
-      data = data.merge("app" => @app_override)
-    end
-
-    data = sanitize(data)
 
     if already_reporting
-      logger.warn "FAILBOT: asked to report while reporting! #{data.inspect}" rescue nil
+      logger.warn "FAILBOT: asked to report while reporting!" rescue nil
       logger.warn e.message rescue nil
       logger.warn e.backtrace.join("\n") rescue nil
       return
     end
-
     self.already_reporting = true
-    backend.report(data)
-    instrument("report.failbot", data)
-  rescue Object => i
-    # don't fail for any reason
-    logger.debug "FAILBOT: #{data.inspect}" rescue nil
-    logger.debug e.message rescue nil
-    logger.debug e.backtrace.join("\n") rescue nil
-    logger.debug i.message rescue nil
-    logger.debug i.backtrace.join("\n") rescue nil
-  ensure
-    self.already_reporting = false
+
+    begin
+      data = squash_contexts(context, exception_info(e), other)
+
+      if !data.has_key?("rollup")
+        data = data.merge("rollup" => @rollup.call(e, data))
+      end
+
+      if @before_report
+        data = squash_contexts(data, @before_report.call(e, data))
+      end
+
+      if @app_override
+        data = data.merge("app" => @app_override)
+      end
+
+      data = sanitize(data)
+
+      backend.report(data)
+      instrument("report.failbot", data)
+    rescue Object => i
+      # don't fail for any reason
+      logger.debug "FAILBOT: #{data.inspect}" rescue nil
+      logger.debug e.message rescue nil
+      logger.debug e.backtrace.join("\n") rescue nil
+      logger.debug i.message rescue nil
+      logger.debug i.backtrace.join("\n") rescue nil
+    ensure
+      self.already_reporting = false
+    end
   end
 
   # Public: Disable exception reporting. This is equivalent to calling

data/lib/failbot/version.rb

@@ -1,3 +1,3 @@
 module Failbot
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: failbot
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - "@rtomayko"
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Deliver exceptions to Haystack