honeybadger 1.11.0 → 1.11.1

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## Honeybadger 1.11.0 (unreleased) ##
+## Honeybadger 1.11.1 ##
+
+* Add option to log the exception locally when the API cannot be
+  reached.
+
+  *Justin Mazzi*
+
+## Honeybadger 1.11.0 ##
 
 * Filter params from query strings in rack env.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    honeybadger (1.11.0)
+    honeybadger (1.11.1)
       json
 
 GEM
@@ -57,6 +57,7 @@ GEM
       rspec (~> 2.13)
     highline (1.6.20)
     json (1.8.1)
+    json (1.8.1-java)
     listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)

data/gemfiles/rack.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.11.0)
+    honeybadger (1.11.1)
       json
 
 GEM

data/gemfiles/rails2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.11.0)
+    honeybadger (1.11.1)
       json
 
 GEM

data/gemfiles/rails3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.11.0)
+    honeybadger (1.11.1)
       json
 
 GEM

data/gemfiles/rails3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.11.0)
+    honeybadger (1.11.1)
       json
 
 GEM

data/gemfiles/rails3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.11.0)
+    honeybadger (1.11.1)
       json
 
 GEM

data/gemfiles/rails4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.11.0)
+    honeybadger (1.11.1)
       json
 
 GEM

data/gemfiles/rails4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.11.0)
+    honeybadger (1.11.1)
       json
 
 GEM

data/gemfiles/rake.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.11.0)
+    honeybadger (1.11.1)
       json
 
 GEM

data/gemfiles/sinatra.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/josh/code/honeybadger-ruby
   specs:
-    honeybadger (1.11.0)
+    honeybadger (1.11.1)
       json
 
 GEM

data/honeybadger.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'honeybadger'
-  s.version           = '1.11.0'
-  s.date              = '2014-02-05'
+  s.version           = '1.11.1'
+  s.date              = '2014-02-21'
 
   s.summary     = 'Error reports you can be happy about.'
   s.description = 'Make managing application errors a more pleasant experience.'

data/lib/honeybadger.rb

@@ -16,7 +16,7 @@ require 'honeybadger/user_feedback'
 require 'honeybadger/railtie' if defined?(Rails::Railtie)
 
 module Honeybadger
-  VERSION = '1.11.0'
+  VERSION = '1.11.1'
   LOG_PREFIX = "** [Honeybadger] "
 
   HEADERS = {

data/lib/honeybadger/configuration.rb

@@ -8,7 +8,7 @@ module Honeybadger
                :params_filters, :project_root, :port, :protocol, :proxy_host, :proxy_pass,
                :proxy_port, :proxy_user, :secure, :use_system_ssl_cert_chain, :framework,
                :user_information, :feedback, :rescue_rake_exceptions, :source_extract_radius,
-               :send_request_session, :debug, :fingerprint, :hostname, :metrics].freeze
+               :send_request_session, :debug, :fingerprint, :hostname, :metrics, :log_exception_on_send_failure].freeze
 
     # The API key for your project, found on the project edit form.
     attr_accessor :api_key
@@ -103,6 +103,9 @@ module Honeybadger
     # +true+ to log extra debug info, +false+ to suppress
     attr_accessor :debug
 
+    # +true+ to log the original exception on send failure, +false+ to suppress
+    attr_accessor :log_exception_on_send_failure
+
     # A Proc object used to send notices asynchronously
     attr_writer :async
 
@@ -145,38 +148,40 @@ module Honeybadger
                       'CGI::Session::CookieStore::TamperedWithCookie',
                       'ActionController::UnknownAction',
                       'AbstractController::ActionNotFound',
-                      'Mongoid::Errors::DocumentNotFound']
+                      'Mongoid::Errors::DocumentNotFound',
+                      'Sinatra::NotFound']
 
     alias_method :secure?, :secure
     alias_method :use_system_ssl_cert_chain?, :use_system_ssl_cert_chain
 
     def initialize
-      @api_key                   = ENV['HONEYBADGER_API_KEY']
-      @secure                    = true
-      @use_system_ssl_cert_chain = false
-      @host                      = 'api.honeybadger.io'
-      @http_open_timeout         = 2
-      @http_read_timeout         = 5
-      @params_filters            = DEFAULT_PARAMS_FILTERS.dup
-      @backtrace_filters         = DEFAULT_BACKTRACE_FILTERS.dup
-      @ignore_by_filters         = []
-      @ignore                    = IGNORE_DEFAULT.dup
-      @ignore_user_agent         = []
-      @development_environments  = %w(development test cucumber)
-      @notifier_name             = 'Honeybadger Notifier'
-      @notifier_version          = VERSION
-      @notifier_url              = 'https://github.com/honeybadger-io/honeybadger-ruby'
-      @framework                 = 'Standalone'
-      @user_information          = 'Honeybadger Error {{error_id}}'
-      @rescue_rake_exceptions    = nil
-      @source_extract_radius     = 2
-      @send_request_session      = true
-      @debug                     = false
-      @hostname                  = Socket.gethostname
-      @metrics                   = true
-      @features                  = { 'notices' => true }
-      @limit                     = nil
-      @feedback                  = true
+      @api_key                       = ENV['HONEYBADGER_API_KEY']
+      @secure                        = true
+      @use_system_ssl_cert_chain     = false
+      @host                          = 'api.honeybadger.io'
+      @http_open_timeout             = 2
+      @http_read_timeout             = 5
+      @params_filters                = DEFAULT_PARAMS_FILTERS.dup
+      @backtrace_filters             = DEFAULT_BACKTRACE_FILTERS.dup
+      @ignore_by_filters             = []
+      @ignore                        = IGNORE_DEFAULT.dup
+      @ignore_user_agent             = []
+      @development_environments      = %w(development test cucumber)
+      @notifier_name                 = 'Honeybadger Notifier'
+      @notifier_version              = VERSION
+      @notifier_url                  = 'https://github.com/honeybadger-io/honeybadger-ruby'
+      @framework                     = 'Standalone'
+      @user_information              = 'Honeybadger Error {{error_id}}'
+      @rescue_rake_exceptions        = nil
+      @source_extract_radius         = 2
+      @send_request_session          = true
+      @debug                         = false
+      @log_exception_on_send_failure = false
+      @hostname                      = Socket.gethostname
+      @metrics                       = true
+      @features                      = { 'notices' => true }
+      @limit                         = nil
+      @feedback                      = true
     end
 
     # Public: Takes a block and adds it to the list of backtrace filters. When

data/lib/honeybadger/sender.rb

@@ -52,10 +52,12 @@ module Honeybadger
         JSON.parse(response.body).fetch('id')
       else
         log(:error, "Failure: #{response.class}", response, data)
+        log_original_exception(notice)
         nil
       end
     rescue => e
       log(:error, "[Honeybadger::Sender#send_to_honeybadger] Error: #{e.class} - #{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}")
+      log_original_exception(notice)
       nil
     end
 
@@ -159,5 +161,17 @@ module Honeybadger
       log(:error, "[Honeybadger::Sender#setup_http_connection] Failure initializing the HTTP connection.\nError: #{e.class} - #{e.message}\nBacktrace:\n#{e.backtrace.join("\n\t")}")
       raise e
     end
+
+    def log_original_exception(notice)
+      if Honeybadger.configuration.log_exception_on_send_failure
+        if notice.respond_to?(:exception) && notice.respond_to?(:backtrace)
+          message = "#{notice.error_message}\n#{notice.backtrace}"
+        else
+          message = "#{notice}"
+        end
+
+        Honeybadger.write_verbose_log("Original Exception: #{message}", :error)
+      end
+    end
   end
 end

data/spec/honeybadger/configuration_spec.rb

@@ -31,6 +31,7 @@ describe Honeybadger::Configuration do
     assert_config_default :async, nil
     assert_config_default :send_request_session, true
     assert_config_default :debug, false
+    assert_config_default :log_exception_on_send_failure, false
     assert_config_default :fingerprint, nil
     assert_config_default :hostname, Socket.gethostname
     assert_config_default :feedback, true
@@ -117,6 +118,7 @@ describe Honeybadger::Configuration do
     assert_config_overridable :hostname
     assert_config_overridable :metrics
     assert_config_overridable :feedback
+    assert_config_overridable :log_exception_on_send_failure
   end
 
   it "has an api key" do
@@ -132,7 +134,7 @@ describe Honeybadger::Configuration do
      :notifier_version, :params_filters, :project_root, :port, :protocol,
      :proxy_host, :proxy_pass, :proxy_port, :proxy_user, :secure,
      :source_extract_radius, :async, :send_request_session, :debug,
-     :fingerprint, :hostname, :metrics, :feedback].each do |option|
+     :fingerprint, :hostname, :metrics, :feedback, :log_exception_on_send_failure].each do |option|
        expect(hash[option]).to eq config[option]
     end
   end

data/spec/honeybadger/sender_spec.rb

@@ -108,6 +108,39 @@ describe Honeybadger::Sender do
         sender.send_to_honeybadger("stuff")
       end
 
+      it "should log the exception on any error" do
+        Honeybadger.configuration.log_exception_on_send_failure = true
+        notice = Honeybadger::Notice.new(:exception => Exception.new("bad things"))
+        sender = build_sender
+        sender.should_receive(:setup_http_connection).and_raise(RuntimeError)
+        sender.stub(:log)
+
+        Honeybadger.should_receive(:write_verbose_log).with(/Original Exception:.*bad things/, :error)
+        sender.send_to_honeybadger(notice)
+      end
+
+      it "should not log the exception on any error by default" do
+        notice = Honeybadger::Notice.new(:exception => Exception.new("bad things"))
+        sender = build_sender
+        sender.should_receive(:setup_http_connection).and_raise(RuntimeError)
+        sender.stub(:log)
+
+        Honeybadger.should_not_receive(:write_verbose_log).with(/Original Exception:.*bad things/, :error)
+        sender.send_to_honeybadger(notice)
+      end
+
+      it "should log the exception on a non-successful HTTP response" do
+        Honeybadger.configuration.log_exception_on_send_failure = true
+        stub_http(:response => Net::HTTPError)
+        notice = Honeybadger::Notice.new(:exception => Exception.new("bad things"))
+        sender = build_sender
+        sender.stub(:log)
+
+        Honeybadger.should_receive(:write_verbose_log).with(/Original Exception:.*bad things/, :error)
+        sender.send_to_honeybadger(notice)
+      end
+
+
       it "returns nil no matter what" do
         sender  = build_sender
         sender.should_receive(:setup_http_connection).and_raise(LocalJumpError)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -360,7 +360,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 129438582068622733
+      hash: 2540152001783830478
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: