logging-appenders-airbrake 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97f073a81dd1862e5c006694dbb3504a141f1a62
-  data.tar.gz: b208c5332f9065293128d65dfb62357d455525d9
+  metadata.gz: 4bc8885d2e4b19e79b2910cec28b3ab3fc0276e5
+  data.tar.gz: b97e2651aa511cbec10d79c0b7f5e0dc3c6947c6
 SHA512:
-  metadata.gz: 1f5b049f21615fbf3e913fb845d1a2f4bbd7a04ba4d4f48631797b4e1ed0a96ad1250c03484d04cc5cd65fd89bc8f765b11079de51eb8f07be0bac120f081098
-  data.tar.gz: 6ca6d8a69d741182206c717edd31e33aa292f75d9adfe1356b22806d2d487f76359e792c3e89ea0a2909af5a21097aa8cf23a4582dfb3531c639106cddffba51
+  metadata.gz: 6d59b2e5b6616ff0e3807d9199cbdc0431531027f4bf82fe462ea821dc299807b03ee3a183f998862a5b7b72554711cc822226aae898152184c71e042bf824e0
+  data.tar.gz: 2ebb7acc146f01c27ceacbd7bbbc9ecad47a14d3d79385ee456844cdd0651b980015090c1fc08838678d36fbd7bf6a0f90ee84ce824b10578247f1fd3989cb15

data/.travis.yml

@@ -5,6 +5,10 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3
+
+before_install:
+  - gem update bundler
 
 notifications:
   email: false

data/Changes

@@ -1,3 +1,9 @@
+v0.0.3    2016-03-04
+--------------------
+Bug fixes:
+* Call Airbrake.configure when  Airbrake.sender is not set
+* Under Rails 3, prevent exceptions from being sent to Airbrake twice when logger is wrapped by TaggedLogging
+
 v0.0.2    2015-03-21
 --------------------
 Bug fixes:

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/sshaw/logging-appenders-airbrake.svg?branch=master)](https://travis-ci.org/sshaw/logging-appenders-airbrake)
 
-Airbrake appender for [the Logging gem](https://github.com/TwP/logging).
+Airbrake appender for [the Logging gem](https://github.com/TwP/logging). **Airbrake v5 is not supported.**
 
 ## Overview
 
@@ -37,9 +37,13 @@ to the `airbrake` method:
     Logging.appenders.airbrake("another_name", options)
 
 Airbrake configuration can be done via `Airbrake.configure` or via `Logging.appenders.airbrake`.
-All [`Airbrake::Configuration` options](http://www.rubydoc.info/gems/airbrake/Airbrake/Configuration) can be passed
+All [`Airbrake::Configuration` options](http://www.rubydoc.info/gems/airbrake/4.3.0/Airbrake/Configuration) can be passed
 to the latter.
 
+Internally `Airbrake.configure` will be called *only if* `Airbrake.sender` has not been set. This gives
+[some options set by `Airbrake.configure`](http://www.rubydoc.info/gems/airbrake/4.3.0/Airbrake/Sender) precedence over those
+passed into the logger.
+
 ## Using With `logging-rails`
 
 If you're already using Airbrake then your current Airbrake initializer will be used.

data/lib/logging/appenders/airbrake.rb

@@ -11,7 +11,7 @@ module Logging::Appenders
   end
 
   class Airbrake < Logging::Appender
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
 
     # Ignore errors logged by an Airbrake sender
     INTERNAL_BT_FILTER = %r{:in\s+`send_to_airbrake'}.freeze
@@ -29,7 +29,7 @@ module Logging::Appenders
 
       args.compact!
       name = args.first.is_a?(String) ? args.shift : "airbrake"
-      airbrake = args.last.is_a?(Hash) ? args.pop : {}
+      airbrake = args.last.is_a?(Hash) ? args.pop.dup : {}
 
       airbrake[:backtrace_filters] ||= []
       airbrake[:backtrace_filters] << AIRBRAKE_BT_FILTER
@@ -48,6 +48,10 @@ module Logging::Appenders
         end
       end
 
+      # We need a sender else errors will not be sent to Airbrake.
+      # This will create a sender that may use some of the given config.
+      ::Airbrake.configure(true) {} unless ::Airbrake.sender
+
       super(name, appender)
     end
 

data/lib/logging/appenders/airbrake/railtie.rb

@@ -8,10 +8,11 @@ module Logging
         config.after_initialize do |app|
           next unless defined?(::Airbrake::Rails::Middleware) && app.middleware.include?(::Airbrake::Rails::Middleware)
 
+          # Don't use is_a?, the logger maybe be wrapped in ActiveSupport::TaggedLogging
           log = app.env_config["action_dispatch.logger"]
-          next unless log.is_a?(Logging::Logger)
+          next unless log.respond_to?(:appenders=) && log.respond_to?(:additive=)
 
-          # After sending an exception to Airbrake its middleware passes the exception (`raise`es) it up
+          # After sending an exception to Airbrake its middleware passes the exception (`raise`es it) up
           # the stack. Rails' middleware (DebugException, ShowExceptions) ends up logging these as fatal,
           # which triggers the Airbrake appender. To avoid sending the exception twice we remove the appender.
           log.appenders = Logging.logger.root.appenders if log.appenders.none?

data/logging-appenders-airbrake.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "logging-appenders-airbrake"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Skye Shaw"]
   spec.email         = ["skye.shaw@gmail.com"]
   spec.summary       = %q{Airbrake appender for the Logging gem}
@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = "> 1.8.7"
 
-  spec.add_dependency "airbrake"
+  spec.add_dependency "airbrake", "~> 4.1"
   spec.add_dependency "logging"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest", "~> 5.1"
 end

data/test/test_airbrake.rb

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 require "minitest/autorun"
-require "minitest/mock"
 
 require "logging"
 require "logging/appenders/airbrake"
@@ -25,6 +24,8 @@ class TestAirbrake < MiniTest::Unit::TestCase
     refute_nil Logging.logger["airbrake"]
     assert_same app, Logging.appenders.airbrake
 
+    refute_nil Airbrake.sender
+
     assert_equal config[:api_key], Airbrake.configuration.api_key
     assert_equal config[:host], Airbrake.configuration.host
     config[:ignore].each do |name|
@@ -38,6 +39,8 @@ class TestAirbrake < MiniTest::Unit::TestCase
     refute_nil Logging.logger["sshaw"]
     refute_same app, Logging.appenders.airbrake
 
+    refute_nil Airbrake.sender
+
     assert_equal config[:api_key], Airbrake.configuration.api_key
     assert_equal config[:host], Airbrake.configuration.host
     config[:ignore].each do |name|
@@ -74,7 +77,17 @@ class TestAirbrake < MiniTest::Unit::TestCase
     log.error("some error")
   end
 
+  def test_custom_sender_not_overwritten
+    Airbrake.sender = FailingSender.new
+
+    log = Logging.logger[__method__]
+    log.add_appenders(appender)
+
+    assert_instance_of FailingSender, Airbrake.sender
+  end
+
   private
+
   def config
     @config ||= {
       :api_key => "X123",

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: logging-appenders-airbrake
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Skye Shaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 description: An appender for the Logging gem that sends all messages logged at the
   :error level to Airbrake
 email:
@@ -104,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Airbrake appender for the Logging gem