lograge 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e83952d334c15f42c841f0ed45c8e1538e795ab
-  data.tar.gz: 581be0bc6a70dfa1abaad4bbefef0a80115f837c
+  metadata.gz: a85786ea77c363233831965c6e03f24bca37cd24
+  data.tar.gz: 9d1c277d2df5eda46969e444aa356ba99ea40e89
 SHA512:
-  metadata.gz: f21494756b287b5d0c95594f9a285b70e2af281f9b25a19f4e2c90a4656058cadc869337f9671002af5403ffc2331b8a3e1230ba3363e0c7b861e7569f8fb30c
-  data.tar.gz: 09f4b1e38c61db6caff08c51019ffdb982f2b7ca536ea5be7edbbd9a113fb48ca3dbb041603737cedaf810cbcb85c48b9d9a166fd330de7ca0639523d53ccb3d
+  metadata.gz: c008c958f766ae2a01360c5873320f13cb22065a3fe5b61ec873ef078d85bbcfba2f5d2a5f6e164ab996f565be1f73a7e48efe0c6fe4b210f94180b3904446cb
+  data.tar.gz: eb3f7560580199ecde41d01740dc4a95b8b6a4d3e31c82035e0c8bc899009d29553fb649b46c8913981730bc1a7f33046080e423cd10655c1b0ccf1dcf7b4ca9

data/lib/lograge.rb

@@ -12,6 +12,7 @@ require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/ordered_options'
 
+# rubocop:disable ModuleLength
 module Lograge
   module_function
 
@@ -26,7 +27,7 @@ module Lograge
   mattr_writer :custom_options
   self.custom_options = nil
 
-  def self.custom_options(event)
+  def custom_options(event)
     if @@custom_options.respond_to?(:call)
       @@custom_options.call(event)
     else
@@ -40,7 +41,7 @@ module Lograge
   mattr_writer :before_format
   self.before_format = nil
 
-  def self.before_format(data, payload)
+  def before_format(data, payload)
     result = nil
     result = @@before_format.call(data, payload) if @@before_format
     result || data
@@ -58,7 +59,7 @@ module Lograge
   # are given to 'ignore'.  Both methods can be called multiple times, which
   # just adds more ignore conditions to a list that is checked before logging.
 
-  def self.ignore_actions(actions)
+  def ignore_actions(actions)
     ignore(lambda do |event|
              params = event.payload[:params]
              Array(actions).include?("#{params['controller']}##{params['action']}")
@@ -69,7 +70,7 @@ module Lograge
     @ignore_tests ||= []
   end
 
-  def self.ignore(test)
+  def ignore(test)
     ignore_tests.push(test) if test
   end
 
@@ -77,7 +78,7 @@ module Lograge
     @ignore_tests = []
   end
 
-  def self.ignore?(event)
+  def ignore?(event)
     ignore_tests.any? { |ignore_test| ignore_test.call(event) }
   end
 
@@ -92,7 +93,7 @@ module Lograge
   #  - :logstash - JSON formatted as a Logstash Event.
   mattr_accessor :formatter
 
-  def self.remove_existing_log_subscriptions
+  def remove_existing_log_subscriptions
     ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
       case subscriber
       when ActionView::LogSubscriber
@@ -103,7 +104,7 @@ module Lograge
     end
   end
 
-  def self.unsubscribe(component, subscriber)
+  def unsubscribe(component, subscriber)
     events = subscriber.public_methods(false).reject { |method| method.to_s == 'call' }
     events.each do |event|
       ActiveSupport::Notifications.notifier.listeners_for("#{event}.#{component}").each do |listener|
@@ -114,27 +115,54 @@ module Lograge
     end
   end
 
-  def self.setup(app)
+  def setup(app)
     self.application = app
-    app.config.action_dispatch.rack_cache[:verbose] = false if app.config.action_dispatch.rack_cache
+    disable_rack_cache_verbose_output
+    keep_original_rails_log
 
-    unless app.config.lograge.keep_original_rails_log
-      require 'lograge/rails_ext/rack/logger'
-      Lograge.remove_existing_log_subscriptions
-    end
+    attach_to_action_controller
+    set_lograge_log_options
+    support_deprecated_config # TODO: Remove with version 1.0
+    set_formatter
+    set_ignores
+  end
 
-    Lograge.logger = app.config.lograge.logger
+  def set_ignores
+    Lograge.ignore_actions(lograge_config.ignore_actions)
+    Lograge.ignore(lograge_config.ignore_custom)
+  end
 
+  def set_formatter
+    Lograge.formatter = lograge_config.formatter || Lograge::Formatters::KeyValue.new
+  end
+
+  def attach_to_action_controller
     Lograge::RequestLogSubscriber.attach_to :action_controller
+  end
+
+  def set_lograge_log_options
+    Lograge.logger = lograge_config.logger
     Lograge.custom_options = lograge_config.custom_options
     Lograge.before_format = lograge_config.before_format
     Lograge.log_level = lograge_config.log_level || :info
-    support_deprecated_config # TODO: Remove with version 1.0
-    Lograge.formatter = lograge_config.formatter || Lograge::Formatters::KeyValue.new
-    Lograge.ignore_actions(lograge_config.ignore_actions)
-    Lograge.ignore(lograge_config.ignore_custom)
   end
 
+  def disable_rack_cache_verbose_output
+    application.config.action_dispatch.rack_cache[:verbose] = false if rack_cache_hashlike?(application)
+  end
+
+  def keep_original_rails_log
+    return if lograge_config.keep_original_rails_log
+
+    require 'lograge/rails_ext/rack/logger'
+    Lograge.remove_existing_log_subscriptions
+  end
+
+  def rack_cache_hashlike?(app)
+    app.config.action_dispatch.rack_cache && app.config.action_dispatch.rack_cache.respond_to?(:[]=)
+  end
+  private_class_method :rack_cache_hashlike?
+
   # TODO: Remove with version 1.0
 
   def support_deprecated_config

data/lib/lograge/formatters/logstash.rb

@@ -5,7 +5,7 @@ module Lograge
         load_dependencies
         event = LogStash::Event.new(data)
 
-        event.message = "[#{data[:status]}] #{data[:method]} #{data[:path]} (#{data[:controller]}##{data[:action]})"
+        event['message'] = "[#{data[:status]}] #{data[:method]} #{data[:path]} (#{data[:controller]}##{data[:action]})"
         event.to_json
       end
 

data/lib/lograge/log_subscriber.rb

@@ -1,5 +1,4 @@
 require 'json'
-
 require 'active_support/core_ext/class/attribute'
 require 'active_support/log_subscriber'
 
@@ -10,7 +9,7 @@ module Lograge
 
       payload = event.payload
 
-      data      = extract_request(payload)
+      data = extract_request(payload)
       extract_status(data, payload)
       runtimes(data, event)
       location(data)
@@ -62,13 +61,19 @@ module Lograge
         data[:status] = status.to_i
       elsif (error = payload[:exception])
         exception, message = error
-        data[:status] = 500
-        data[:error]  = "#{exception}:#{message}"
+        data[:status] = get_error_status_code(exception)
+        data[:error] = "#{exception}: #{message}"
       else
         data[:status] = 0
       end
     end
 
+    def get_error_status_code(exception)
+      exception_object = exception.constantize.new
+      exception_wrapper = ::ActionDispatch::ExceptionWrapper.new({}, exception_object)
+      exception_wrapper.status_code
+    end
+
     def custom_options(data, event)
       options = Lograge.custom_options(event)
       data.merge! options if options

data/lib/lograge/version.rb

@@ -1,3 +1,3 @@
 module Lograge
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lograge
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Mathias Meyer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -127,3 +127,4 @@ signing_key:
 specification_version: 4
 summary: Tame Rails' multi-line logging into a single line per request
 test_files: []
+has_rdoc: