failbot 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3383e57149a6965ae7803d6170a66dd65f2932d
-  data.tar.gz: 08940607fb5553f0641fc35f55a8b019e185a571
+  metadata.gz: 535bea1efe92287487fb8eca35fa79362b5a3467
+  data.tar.gz: 6e95a3258b3778cb4c832201431685fed770051f
 SHA512:
-  metadata.gz: fd26e1e21ee3d9f5d8b6352302d26678d1b40d0c86138fd8e509bc92d5e5aa4ee966adca191924b867228b25a0a9a81a9c39964869dc6154bc435c74aeb272c5
-  data.tar.gz: 90ef4318bad3829e2018f7832e288c62fdb3d3b1e1f61da138c1767870969271f242a759550a69f822d2ea74703ce54ef57f42d1d7e855de97f4f51b1278273c
+  metadata.gz: 837e0d280e169632d08e79fb3f5703278f622a43fc7dbc3c36dec172d7fe8b46f90fa92d9634c8e2289186f1c7e0ccc218cae974931798c0f5002d833654e6a2
+  data.tar.gz: 75dd783805b131deda512d0234fa08a517e9482751aac30b2cdc5c05ad142430bde3531f6f749c2da451c089f815b24a3502122e9a1acd1ef527dc4ad190b77d

data/lib/failbot.rb

@@ -24,6 +24,9 @@ module Failbot
   autoload :MemoryBackend, 'failbot/memory_backend'
   autoload :JSONBackend,   'failbot/json_backend'
 
+  # prevent recursive calls to Failbot.report!
+  attr_accessor :already_reporting
+
   # Public: Setup the backend for reporting exceptions.
   def setup(settings={}, default_context={})
     deprecated_settings = %w[
@@ -124,6 +127,15 @@ module Failbot
 
   def report!(e, other = {})
     data = squash_context(exception_info(e), other)
+
+    if already_reporting
+      logger.warn "FAILBOT: asked to report while reporting! #{data.inspect}" 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)
   rescue Object => i
     # don't fail for any reason
@@ -132,6 +144,8 @@ module Failbot
     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
 
   # Public: exceptions that were reported. Only available when using the
@@ -186,6 +200,10 @@ module Failbot
       'created_at' => Time.now.utc.iso8601(6)
     }
 
+    if exception_context = (e.respond_to?(:failbot_context) && e.failbot_context)
+      res.merge!(exception_context)
+    end
+
     if original = (e.respond_to?(:original_exception) && e.original_exception)
       remote_backtrace  = []
       remote_backtrace << original.message

data/lib/failbot/haystack.rb

@@ -26,13 +26,17 @@ module Failbot
       end
 
       # make request
-      req = Net::HTTP.new(@url.host, @url.port)
+      http = Net::HTTP.new(@url.host, @url.port)
 
       # use SSL if applicable
-      req.use_ssl = true if @url.scheme == "https"
+      http.use_ssl = true if @url.scheme == "https"
 
       # push it through
-      req.start { |http| http.request(post) }
+      response = http.request(post)
+
+      # Raise if the exception doesn't make it to Haystack, ensures the failure
+      # is logged
+      raise StandardError, "couldn't send exception to Haystack" unless response.code == "201"
     end
 
     def self.send_data(data)

data/lib/failbot/version.rb

@@ -1,3 +1,3 @@
 module Failbot
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: failbot
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - '@rtomayko'
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby