rails_semantic_logger 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cdd33618927fbb42d25eebd261c682dc05a9408
-  data.tar.gz: 69e28c6b4ca5dc2d33b970af7fd38733bf50e12d
+  metadata.gz: 4a7c538cec8c358c81939c54ff8db6ce47e1ca46
+  data.tar.gz: 9eeb2407f8157458f9dcbf2db5577a06140df5a8
 SHA512:
-  metadata.gz: 8fc1e2d4a6724bfc0640b10b7a33340d53feed9acd06ac7ca515031d25043128c82fd43f64e0eae4ac9844716af83adae05d7fe17047eb6ccfe170943d70db7b
-  data.tar.gz: 331526a71a7c1f4341f17eb2da10223a6484faf0dcf1e02cf05742b960d257b270a13d4ddbdaca4c4cfc8a41d7e8503af9c00cb4bfad6321a296f8d452c4d7ee
+  metadata.gz: f2b620e2153ed6201c4c84434fe8e94d41fa1635dd414cd23b669b4258b5a4fc2cefddce129ab415976587ef9abdd53e6594d97c8e07f98be8fd2659d71fc4a2
+  data.tar.gz: 3aaeb1cd8136eeb906051a41ad45ce2d709bb46cf3c458f4fb520c9548f3de82898bf67eae8a32992b12b13de650b0d97ecbb9872311ee150640a66a6c5fc32d

data/lib/rails_semantic_logger/engine.rb

@@ -56,18 +56,44 @@ module RailsSemanticLogger
     # Silence asset logging
     config.rails_semantic_logger.quiet_assets      = false
 
-    # Hash of named tags.
-    # Use in a similar fashion to the Rails config.log_tags, except that it is now a hash.
+    # Override the output format for the primary Rails log file.
     #
-    # Example:
-    #   config.rails_semantic_logger.named_tags = {
-    #     request_id: :request_id,
-    #     ip:         :remote_ip,
-    #     user:       -> request { request.cookie_jar['login'] }
-    #   }
+    # Valid options:
+    # * :default
+    #     Plain text output with no color.
+    # * :color
+    #     Plain text output with color.
+    # * :json
+    #     JSON output format.
+    # * class
     #
-    # Notes:
-    # - Nil Values are ignored and will be left out of the named tags.
+    # * Proc
+    #     A block that will be called to format the output.
+    #     It is supplied with the `log` entry and should return the formatted data.
+    #
+    # Note:
+    # * `:default` is automatically changed to `:color` if `config.colorize_logging` is `true`.
+    #
+    # JSON Example, in `application.rb`:
+    #
+    #   config.rails_semantic_logger.format = :json
+    #
+    # Custom Example, create `app/lib/my_formatter.rb`:
+    #
+    #   # My Custom colorized formatter
+    #   class MyFormatter < SemanticLogger::Formatters::Color
+    #     # Return the complete log level name in uppercase
+    #     def level
+    #       "#{color}log.level.upcase#{color_map.clear}"
+    #     end
+    #   end
+    #
+    #   # In application.rb:
+    #   config.rails_semantic_logger.format = MyFormatter.new
+    config.rails_semantic_logger.format            = :default
+
+    # DEPRECATED
+    # Instead, supply a Hash to config.log_tags
     config.rails_semantic_logger.named_tags        = nil
 
     # Initialize SemanticLogger. In a Rails environment it will automatically
@@ -93,7 +119,8 @@ module RailsSemanticLogger
           # Add the log file to the list of appenders
           # Use the colorized formatter if Rails colorized logs are enabled
           ap_options                       = config.rails_semantic_logger.ap_options
-          formatter                        = config.colorize_logging == false ? SemanticLogger::Formatters::Default.new : SemanticLogger::Formatters::Color.new(ap: ap_options)
+          formatter                        = config.rails_semantic_logger.format
+          formatter                        = SemanticLogger::Formatters::Color.new(ap: ap_options) if (formatter == :default) && (config.colorize_logging != false)
 
           # Set internal logger to log to file only, in case another appender experiences errors during writes
           appender                         = SemanticLogger::Appender::File.new(file_name: path, level: config.log_level, formatter: formatter)
@@ -209,8 +236,9 @@ module RailsSemanticLogger
         require('rails_semantic_logger/extensions/action_controller/log_subscriber_processing') if defined?(ActionView::LogSubscriber)
       end
 
-      if config.rails_semantic_logger.named_tags && defined?(Rails::Rack::Logger)
-        Rails::Rack::Logger.named_tags = config.rails_semantic_logger.named_tags
+      # Backward compatibility
+      if config.rails_semantic_logger.named_tags
+        config.log_tags = config.rails_semantic_logger.named_tags
       end
     end
 

data/lib/rails_semantic_logger/extensions/active_record/log_subscriber.rb

@@ -11,26 +11,25 @@ module ActiveRecord
       return if IGNORE_PAYLOAD_NAMES.include?(name)
 
       log_payload = {
-        sql:      payload[:sql],
+        sql: payload[:sql],
       }
-      log = {
+      log         = {
         message:  name,
         payload:  log_payload,
         duration: event.duration
       }
       unless (payload[:binds] || []).empty?
         log_payload[:binds] = binds = {}
-        # Changed with Rails 5
-        if Rails.version.to_f >= 5.1
-          casted_params = type_casted_binds(payload[:binds], payload[:type_casted_binds])
-          payload[:binds].zip(casted_params).map { |attr, value|
-            render_bind(attr, value)
-          }
-        elsif Rails.version.to_i >= 5
+        if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR == 0 && Rails::VERSION::TINY <= 2
           payload[:binds].each do |attr|
             attr_name, value = render_bind(attr)
             binds[attr_name] = value
           end
+        elsif Rails::VERSION::MAJOR >= 5
+          casted_params = type_casted_binds(payload[:binds], payload[:type_casted_binds])
+          payload[:binds].zip(casted_params).map { |attr, value|
+            render_bind(attr, value)
+          }
         else
           payload[:binds].each do |col, v|
             attr_name, value = render_bind(col, v)

data/lib/rails_semantic_logger/extensions/rails/rack/logger.rb

@@ -4,8 +4,6 @@ Rails::Rack::Logger
 module Rails
   module Rack
     class Logger
-      mattr_accessor :named_tags
-
       @logger = SemanticLogger['Rack']
 
       def self.logger
@@ -15,9 +13,13 @@ module Rails
       def call(env)
         request = ActionDispatch::Request.new(env)
 
-        proc = -> { call_app(request, env) }
-        proc = -> { logger.tagged(compute_tags(request), &proc) } if @taggers && !@taggers.empty?
-        named_tags ? SemanticLogger.named_tagged(compute_named_tags(request), &proc) : proc.call
+        # Check for named tags (Hash)
+        if @taggers && !@taggers.empty?
+          tags = @taggers.is_a?(Hash) ? compute_named_tags(request) : compute_tags(request)
+          logger.tagged(tags) { call_app(request, env) }
+        else
+          call_app(request, env)
+        end
       end
 
       def started_request_message(request)
@@ -37,10 +39,11 @@ module Rails
         self.class.logger
       end
 
+      # Leave out any named tags with a nil value
       def compute_named_tags(request) # :doc:
         tagged = {}
-        named_tags.each_pair do |tag, value|
-          resolved =
+        @taggers.each_pair do |tag, value|
+          resolved    =
             case value
             when Proc
               value.call(request)

data/lib/rails_semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module RailsSemanticLogger #:nodoc
-  VERSION = '4.1.1'
+  VERSION = '4.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_semantic_logger
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails