tablexi-logger 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24f5baa0ee4ada9002d1ede440013adf9700244e
-  data.tar.gz: 2ea1197b9a786f1a5f0b92cf75dea74493ff6b00
+  metadata.gz: 2d9fa826ea67489a42f9e5cb480eaa5f6d6c7bec
+  data.tar.gz: 8a6f3c8d05b8154b830874388258b55d10ed4e25
 SHA512:
-  metadata.gz: 2828d849cb6f2b4c1822fe0c8bd5341ae7d90ef5c166d17bacd4713eec25aa2fbb2d2f37aea50f5af4b0271945d2bccea065d0ff8c56393f612a0389d0d8490e
-  data.tar.gz: 6a0d581fc5270ad173d52cf55b248a24415beebbc2bfdc433802ccb314aa740c91c624a6d723ee11275b87f0f33c881c869634e3c4ef6ad15ba173f3897b683f
+  metadata.gz: 9a8cc8890f0aa7e77ecbb838f51ccb7d7a148e1377a0ee72deb9d11be842382c149175ad217020da6256a83657d92800707d1ead524f0d62785f5cc1f009319f
+  data.tar.gz: cc024a93bf7e314560b2ad3f4e1e0976c96cf4d18a4a92d3e274ccec604846b368984ef30ef4d6ab8f81c1d94163790a48b5bd00e67088484007cdbe58f861e1

data/Changelog.md

@@ -0,0 +1,9 @@
+# Changelog (in reverse chronological order)
+
+## 1.1.0 (2015-09-02)
+
+* Detect lograge, and prevent corruption of lograge-formatted logs
+
+## 1.0.0 (2015-09-02)
+
+Initial release.

data/README.md

@@ -21,7 +21,7 @@ Tablexi.logger.error "Request Timeout", metric: :timeout_error
 You may also assign the logger, for example configuring a null logger would look like this:
 
 ```ruby
-Tablexi.logger = ::Logger.new(File.open(File::NULL, "w"))
+Tablexi.logger = Tablexi::Logger.new # not configured with any handlers, so does nothing
 ```
 
 ## Extending Functionality

data/circle.yml

@@ -1,6 +1,6 @@
 machine:
   ruby:
-    version: 2.1.4
+    version: 2.2.2
 dependencies:
   pre:
     - gem install bundler --pre
@@ -8,3 +8,5 @@ test:
   override:
     - bundle exec rspec --order rand -fd --format RspecJunitFormatter --out $CIRCLE_TEST_REPORTS/rspec.xml:
         parallel: true
+  post:
+    - bundle exec rubocop

data/lib/tablexi/logger.rb

@@ -10,6 +10,7 @@ require "tablexi/logger/option_filter/humanize_request"
 module Tablexi
   class << self
     attr_writer :logger
+    attr_writer :bare_logger
 
     def logger
       @logger ||= default_logger
@@ -18,9 +19,11 @@ module Tablexi
     def default_logger(base_logger = bare_logger)
       Logger.new.tap do |logger|
         logger.option_filters << Tablexi::Logger::OptionFilter::HumanizeRequest
+
         Tablexi::Logger::SEVERITIES.each do |severity|
           logger.handlers[severity] << Tablexi::Logger::Standard.new(base_logger, severity: severity)
         end
+
         trackable_severities = %i(error fatal unknown)
         logger.handle trackable_severities, &Tablexi::Logger::Rollbar if defined?(::Rollbar)
         logger.handle trackable_severities, &Tablexi::Logger::NewRelic if defined?(::NewRelic)
@@ -28,9 +31,8 @@ module Tablexi
     end
 
     private def bare_logger
-      Rails.logger
-    rescue NameError
-      ::Logger.new($stdout).tap do |config|
+      return @bare_logger if @bare_logger
+      @bare_logger = ::Logger.new($stdout).tap do |config|
         config.level = ::Logger::DEBUG
       end
     end
@@ -80,3 +82,5 @@ module Tablexi
     end
   end
 end
+
+require "tablexi/logger/railtie" if defined?(Rails)

data/lib/tablexi/logger/railtie.rb

@@ -0,0 +1,25 @@
+module Tablexi
+  class Logger
+    class Railtie < Rails::Railtie
+      config.after_initialize do |app|
+        Tablexi.bare_logger = Rails.logger
+
+        setup_lograge(app) if defined?(Lograge) && app.config.lograge.enabled
+      end
+
+      def setup_lograge(app)
+        # since Lograge's after_initialize isn't guaranteed to run before this one
+        # we need to make sure the setup occurs before we check lograge.logger
+        Lograge.setup(app)
+
+        if app.config.lograge.logger == Rails.logger
+          # We need to preserve lograge file format integrity if lograge is using
+          # Rails.logger - presumably error tracking services will report the errors
+          # so they aren't swallowed silently.
+          null_logger = ::Logger.new(File.open(File::NULL, "w"))
+          Tablexi.bare_logger = null_logger
+        end
+      end
+    end
+  end
+end

data/lib/tablexi/logger/version.rb

@@ -1,5 +1,5 @@
 module Tablexi
   class Logger
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tablexi-logger
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Table XI Partners LLC
@@ -91,6 +91,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- Changelog.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -101,6 +102,7 @@ files:
 - lib/tablexi/logger.rb
 - lib/tablexi/logger/new_relic.rb
 - lib/tablexi/logger/option_filter/humanize_request.rb
+- lib/tablexi/logger/railtie.rb
 - lib/tablexi/logger/rollbar.rb
 - lib/tablexi/logger/severities.rb
 - lib/tablexi/logger/standard.rb