active_logger 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1a35016af400de6d23b4b50eee7a458714a0c8b293c7bb6e58cdca42b7f099a
-  data.tar.gz: f7803ae045906c0c07146f7d9adb9a619bbac0ace29fcc6b69aa10b783e1ad73
+  metadata.gz: 57d404bf8defccccc9a8f05b57bf3779a512e5ac67a095ac1c994aa487fb7ee3
+  data.tar.gz: df5fa3f1b23c19126d86e197240c215ea6bedd9fce870e6ad0bfdda149f6dace
 SHA512:
-  metadata.gz: da2ed14c7c27986ac84027907af0edc17c90ed91209657ca2b5b1627e3cd079fafd647504aef5d4aae4b773e7506886f13b089c1c0f5987f0d94cc0c2db5e0dc
-  data.tar.gz: 1007b8ecdd143e6822e0296493801768e933aa32791243d8ae1280391c57e7eccc681c112a81d9791c9fad4b068a91c9b031b2be20df79b1e0404f45a64bd0b7
+  metadata.gz: b49cb0632467d2174d3f3f75e3abc2e54e1215ae4ff67f7bcf111048f6e24ef533a50ab75c6cb7880b4cd8176f03d3a09e6df7ae0cf46d8e79aa45676c2763e4
+  data.tar.gz: 76f8ee7fa78bab1250bcece99cb1f46edaeeab33dbab9d4bcd661e411feadf74e1157f8d9f3aeffb2b0f4b95a3e226e23f6d4dcf94e35b9d34dfbc472fce7cfb

data/.rubocop.yml

@@ -14,3 +14,7 @@ Metrics/BlockLength:
 
 Metrics/MethodLength:
   Enabled: false
+
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 30

data/.rubocop_todo.yml

@@ -1,22 +1,7 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-04-19 23:21:57 +0300 using RuboCop version 0.82.0.
+# on 2020-04-22 16:12:47 +0300 using RuboCop version 0.82.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-Lint/UselessAssignment:
-  Exclude:
-    - 'lib/active_logger/logger.rb'
-
-# Offense count: 1
-# Configuration parameters: IgnoredMethods.
-Metrics/AbcSize:
-  Max: 19
-
-# Offense count: 1
-# Configuration parameters: IgnoredMethods.
-Metrics/CyclomaticComplexity:
-  Max: 7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_logger (0.2.0)
+    active_logger (0.3.0)
       activesupport (>= 5.0.0)
 
 GEM

data/lib/active_logger/logger.rb

@@ -24,7 +24,8 @@ module ActiveLogger
       end
 
       assign_appenders = appenders.drop(1)
-      assign_appenders.inject(appenders[0]) { |appender, acc| acc.extend(ActiveSupport::Logger.broadcast(appender)) }
+      loggers = assign_appenders.inject(appenders[0]) { |appender, acc| acc.extend(ActiveSupport::Logger.broadcast(appender)) }
+      TaggedLogging.new(loggers)
     end
 
     def loggable(type, options = {})

data/lib/active_logger/tagged_logging.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/object/blank'
+
+module ActiveLogger
+  module TaggedLogging # :nodoc:
+    module Formatter # :nodoc:
+      # This method is invoked when a log event occurs.
+      def call(severity, timestamp, progname, msg)
+        super(severity, timestamp, progname, "#{tags_text}#{msg}")
+      end
+
+      def tagged(*tags)
+        new_tags = push_tags(*tags)
+        yield self
+      ensure
+        pop_tags(new_tags.size)
+      end
+
+      def push_tags(*tags)
+        @tags_text = nil
+        tags.flatten!
+        tags.reject!(&:blank?)
+        current_tags.concat tags
+        tags
+      end
+
+      def pop_tags(size = 1)
+        @tags_text = nil
+        current_tags.pop size
+      end
+
+      def clear_tags!
+        @tags_text = nil
+        current_tags.clear
+      end
+
+      def current_tags
+        # We use our object ID here to avoid conflicting with other instances
+        thread_key = @thread_key ||= "activesupport_tagged_logging_tags:#{object_id}"
+        Thread.current[thread_key] ||= []
+      end
+
+      def tags_text
+        @tags_text ||= begin
+          tags = current_tags
+          if tags.one?
+            "[#{tags[0]}] "
+          elsif tags.any?
+            tags.collect { |tag| "[#{tag}] " }.join
+          end
+        end
+      end
+    end
+
+    module LocalTagStorage # :nodoc:
+      attr_accessor :current_tags
+
+      def self.extended(base)
+        base.current_tags = []
+      end
+    end
+
+    def self.new(logger)
+      logger = logger.dup
+
+      logger.formatter =
+        if logger.formatter
+          logger.formatter.dup
+        else
+          # Ensure we set a default formatter so we aren't extending nil!
+          ActiveSupport::Logger::SimpleFormatter.new
+        end
+
+      logger.formatter.extend Formatter
+      logger.extend(self)
+    end
+
+    delegate :push_tags, :pop_tags, :clear_tags!, to: :formatter
+
+    def tagged(*tags)
+      if block_given?
+        formatter.tagged(*tags) { yield self }
+      else
+        logger = ActiveLogger::TaggedLogging.new(self)
+        logger.formatter.extend LocalTagStorage
+        logger.push_tags(*formatter.current_tags, *tags)
+        logger
+      end
+    end
+
+    def flush
+      clear_tags!
+      super if defined?(super)
+    end
+  end
+end

data/lib/active_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveLogger
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/active_logger.rb

@@ -15,4 +15,5 @@ end
 require File.dirname(__FILE__) + '/active_logger/helpers/base'
 require File.dirname(__FILE__) + '/active_logger/helpers/appender'
 
+require File.dirname(__FILE__) + '/active_logger/tagged_logging'
 require File.dirname(__FILE__) + '/active_logger/logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yury Snegirev
@@ -49,6 +49,7 @@ files:
 - lib/active_logger/helpers/appender.rb
 - lib/active_logger/helpers/base.rb
 - lib/active_logger/logger.rb
+- lib/active_logger/tagged_logging.rb
 - lib/active_logger/version.rb
 - log/.keep
 homepage: https://github.com/jurrick/active_logger