failbot 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c43604c17fd3f70e059393df33105ff1859a525
-  data.tar.gz: b6001b69118747ba9a4f852b8cb06411aa7ccddb
+  metadata.gz: d710f1c5942b7b228fb70cebf33d7bfbcc5f3bbf
+  data.tar.gz: 0ab8adce8358db0ebd4745a12b497c33eabf9b3e
 SHA512:
-  metadata.gz: 74a8815c07c15e8df64e60e278140b7c85ad46f354ac514a31f5f27bbeee625f8f8abc7efdcd3c6290bcfbc86d02494e78f1d87a8b3e2281313bd75132a80263
-  data.tar.gz: f43c79a47c6c371dd3c7c8581a13fce6dffd3b7a31c29a8e521bdcba457b15a44152b4474988b5f993a56de41dfe53e843af4a6184a48fe0f46a38c7bbc0b66d
+  metadata.gz: db3c86ddad1bf8070b74ad1d5081b568164be50cc527272177f41515a75c106ded9634fb71f7a2cff69a20c042873b37cfae760122d635f94975b81578d2a26a
+  data.tar.gz: 5f94db35e19e527a0c0d3f6f9b86f1318d08d30dd7eab9d8463986f467671009159501a5fac999deeec9eecfe716ac1253fa9a1cdb7a70491519b583e34a5fd9

data/lib/failbot.rb

@@ -148,6 +148,40 @@ module Failbot
     @before_report = nil
   end
 
+  # Specify a custom block for calculating rollups. It should accept:
+  #
+  # exception - The exception object
+  # context   - The context hash
+  #
+  # The block must return a String.
+  #
+  # If a `rollup` attribute is supplied at the time of reporting, either via
+  # the `failbot_context` method on an exception, or passed to `Failbot.report`,
+  # it will be used as the rollup and this block will not be called.
+  def rollup(&block)
+    @rollup = block
+  end
+
+  # Default rollup for an exception. Exceptions with the same rollup are
+  # grouped together in Haystack. The rollup is an MD5 hash of the exception
+  # class and the raising file, line, and method.
+  DEFAULT_ROLLUP = lambda do |exception, context|
+    backtrace_line = Array(exception.backtrace).first || ""
+    # We want all exceptions from foo.html.erb:123 to be grouped together, no
+    # matter what wacky generated ERB method name is attached to it.
+    cleaned_line = backtrace_line.sub(/_erb__[_\d]+'\z/, "_erb'")
+
+    Digest::MD5.hexdigest("#{exception.class}#{cleaned_line}")
+  end
+
+  private_constant :DEFAULT_ROLLUP
+
+  def use_default_rollup
+    rollup(&DEFAULT_ROLLUP)
+  end
+
+  use_default_rollup
+
   # Public: Sends an exception to the exception tracking service along
   # with a hash of custom attributes to be included with the report. When the
   # raise_errors option is set, this method raises the exception instead of
@@ -178,6 +212,10 @@ module Failbot
     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
@@ -293,9 +331,7 @@ module Failbot
   #
   # e - The exception object to turn into a Hash.
   #
-  # Returns a Hash including a 'class', 'message', 'backtrace', and 'rollup'
-  #   keys. The rollup value is an MD5 hash of the exception class and the
-  #   raising file, line, and method.
+  # Returns a Hash including a 'class', 'message', 'backtrace' keys.
   def exception_info(e)
     backtrace = Array(e.backtrace)[0, 500]
 
@@ -304,7 +340,6 @@ module Failbot
       'message'    => e.message,
       'backtrace'  => backtrace.join("\n"),
       'ruby'       => RUBY_DESCRIPTION,
-      'rollup'     => rollup(e),
       'created_at' => Time.now.utc.iso8601(6)
     }
 
@@ -343,22 +378,6 @@ module Failbot
     Failbot.instrumenter.instrument(name, payload) if Failbot.instrumenter
   end
 
-  # Generate a rollup for an exception. Exceptions with the same rollup are
-  # grouped together in Haystack. The rollup is an MD5 hash of the exception
-  # class and the raising file, line, and method.
-  #
-  # e - The exception object
-  #
-  # Returns a String.
-  def rollup(e)
-    backtrace_line = Array(e.backtrace).first || ""
-    # We want all exceptions from foo.html.erb:123 to be grouped together, no
-    # matter what wacky generated ERB method name is attached to it.
-    cleaned_line = backtrace_line.sub(/_erb__[_\d]+'\z/, "_erb'")
-
-    Digest::MD5.hexdigest("#{e.class}#{cleaned_line}")
-  end
-
   extend self
 
   # If the library was lazy loaded due to failbot/exit_hook.rb and a delayed

data/lib/failbot/json_backend.rb

@@ -54,7 +54,7 @@ module Failbot
       response = yield socket
       response
     ensure
-      socket.close
+      socket.close if socket
     end
   end
 end

data/lib/failbot/version.rb

@@ -1,3 +1,3 @@
 module Failbot
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: failbot
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - "@rtomayko"
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby