rails_semantic_logger 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e9c2ffe09cf14071b342b13be6aad0d0aa8935b
-  data.tar.gz: 8852db53880093561eeedd13700f7c538614e874
+  metadata.gz: 10d16b755cfd965d39a2d7b4d757197633110f70
+  data.tar.gz: 2a1214833f2f880d9e826a237945235aa9786a64
 SHA512:
-  metadata.gz: 28d83ef103945904e2c0817fbf0b9a26baa36cfd9bb644de64b0f172155c5767b49f8bd57b30c6da1b10d80555e352a113333f7884e9779227505d7e9b4fa67f
-  data.tar.gz: fc0d516bdeaf189cd363e7c7e578c40a10a538a461d53ec12e094a958314def91a9eba6b053a9890378f274e43ffb02180bf703327368400dd395dd828016b0e
+  metadata.gz: b089694f067de7d2622a8961742888192a1f5f047605df8c7dbc420aff026257063ae7222e2a50ca42270a4d33540e70d40836092879a6e20a4b36806499721a
+  data.tar.gz: c0a42f4aee7497fcdbefb34b3117bada04d36efdfc6d6d04ae02c6090847973787b1719b6c77b2f229dea2ba92ca826672cc1b30d929bc164896a8be0c8b2138

data/lib/rails_semantic_logger/engine.rb

@@ -56,6 +56,20 @@ 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.
+    #
+    # Example:
+    #   config.rails_semantic_logger.named_tags = {
+    #     request_id: :request_id,
+    #     ip:         :remote_ip,
+    #     user:       -> request { request.cookie_jar['login'] }
+    #   }
+    #
+    # Notes:
+    # - Nil Values are ignored and will be left out of the named tags.
+    config.rails_semantic_logger.named_tags        = nil
+
     # Initialize SemanticLogger. In a Rails environment it will automatically
     # insert itself above the configured rails logger to add support for its
     # additional features
@@ -194,6 +208,10 @@ module RailsSemanticLogger
       if config.rails_semantic_logger.processing
         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
+      end
     end
 
     # Before any initializers run, but after the gems have been loaded

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

@@ -11,7 +11,7 @@ module ActionController
     def process_action(event)
       controller_logger(event).info do
         payload = event.payload.dup
-        payload[:params].except!(*INTERNAL_PARAMS)
+        payload[:params] = payload[:params].to_unsafe_h.except(*INTERNAL_PARAMS)
         payload.delete(:params) if payload[:params].empty?
 
         format           = payload[:format]
@@ -69,6 +69,7 @@ module ActionController
        expire_fragment expire_page write_page).each do |method|
       class_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{method}(event)
+          return unless ActionController::Base.enable_fragment_cache_logging
           controller_logger(event).info do
             key_or_path = event.payload[:key] || event.payload[:path]
             {message: "#{method.to_s.humanize} \#{key_or_path}", duration: event.duration}

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

@@ -4,10 +4,20 @@ Rails::Rack::Logger
 module Rails
   module Rack
     class Logger
-      @@logger = SemanticLogger['Rack']
+      mattr_accessor :named_tags
+
+      @logger = SemanticLogger['Rack']
 
       def self.logger
-        @@logger
+        @logger
+      end
+
+      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
       end
 
       def started_request_message(request)
@@ -27,6 +37,23 @@ module Rails
         self.class.logger
       end
 
+      def compute_named_tags(request) # :doc:
+        tagged = {}
+        named_tags.each_pair do |tag, value|
+          resolved =
+            case value
+            when Proc
+              value.call(request)
+            when Symbol
+              request.send(value)
+            else
+              value
+            end
+          tagged[tag] = resolved unless resolved.nil?
+        end
+        tagged
+      end
+
     end
   end
 end

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

@@ -5,7 +5,7 @@ module Rails
   module Rack
     class Logger
       def self.logger
-        @@logger
+        @logger
       end
 
       private
@@ -23,8 +23,8 @@ module Rails
         self.class.logger
       end
 
-      @@logger = SemanticLogger['Rack']
-      @@logger.extend(LogInfoAsDebug)
+      @logger = SemanticLogger['Rack']
+      @logger.extend(LogInfoAsDebug)
     end
   end
 end

data/lib/rails_semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module RailsSemanticLogger #:nodoc
-  VERSION = '4.0.1'
+  VERSION = '4.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_semantic_logger
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 description: Replaces the default Rails logger with SemanticLogger
 email:
 - reidmo@gmail.com