rails_semantic_logger 4.5.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd55ff856fc246fa4fadefb8a1b82f0736ea61567fbed522697def5df5c89d29
-  data.tar.gz: d98db67a99d334d7c11767bc38673d68f609cece4a646bc9c73b7285194a6e95
+  metadata.gz: 453828593f931f4f57c75337f47ae552a77be8597ef49bb838a4c4fa032f04a7
+  data.tar.gz: 1a1d9354c9368fb9e14703a422e08b9f5274734b281789d220df793af678ae8b
 SHA512:
-  metadata.gz: d245a7a4e849914597cbc15ec55f41ec5e8e6565c8e0836a5229b51f290582a5c5d7374e8834dc4aebcbc41f0332bdd062eeb4b998261bf24e172a7e0fa89e39
-  data.tar.gz: 1e4de44480364eebb089eb723f3f5e361543e19384a9296189ac8d7455f541a095d15b6016516c6127efa03da9f90d17ad6c40612a7be842405a2aa602217009
+  metadata.gz: 69d52f1889d27b459313785c5e98f88e90d8b5367d6c5cca1e10d82d4e7a171095b9cfeae0ceae63b7faaf826e2ef71df36bbc213c7c592a9ceabef75b06e6c8
+  data.tar.gz: a216178a0be935a7c15710d0921fdee562bbe0c46bb5bbd5f2cb5250ad097acdb6142dfd1ec68fe7524afff59d4fc44d2b48d8ea3ad3190f54f539582c65af5f

data/lib/rails_semantic_logger.rb

@@ -52,3 +52,7 @@ module RailsSemanticLogger
 
   private_class_method :subscriber_patterns, :unattach
 end
+
+require("rails_semantic_logger/extensions/mongoid/config") if defined?(Mongoid)
+require("rails_semantic_logger/extensions/active_support/logger") if defined?(ActiveSupport::Logger)
+require("rails_semantic_logger/extensions/rack/server") if defined?(Rack::Server)

data/lib/rails_semantic_logger/active_job/log_subscriber.rb

@@ -5,29 +5,34 @@ module RailsSemanticLogger
     class LogSubscriber < ::ActiveSupport::LogSubscriber
       def enqueue(event)
         log_with_formatter event: event do |fmt|
-          "Enqueued #{fmt.job_info}"
+          {message: "Enqueued #{fmt.job_info}"}
         end
       end
 
       def enqueue_at(event)
         log_with_formatter event: event do |fmt|
-          "Enqueued #{fmt.job_info} at #{fmt.scheduled_at}"
+          {message: "Enqueued #{fmt.job_info} at #{fmt.scheduled_at}"}
         end
       end
 
       def perform_start(event)
         log_with_formatter event: event do |fmt|
-          "Performing #{fmt.job_info}"
+          {message: "Performing #{fmt.job_info}"}
         end
       end
 
       def perform(event)
         ex = event.payload[:exception_object]
         if ex
-          logger.error ex
+          log_with_formatter event: event, log_duration: true, level: :error do |fmt|
+            {
+              message: "Error performing #{fmt.job_info} in #{event.duration.round(2)}ms",
+              exception: ex
+            }
+          end
         else
           log_with_formatter event: event, log_duration: true do |fmt|
-            "Performed #{fmt.job_info} in #{event.duration.round(2)}ms"
+            {message: "Performed #{fmt.job_info} in #{event.duration.round(2)}ms"}
           end
         end
       end
@@ -107,10 +112,10 @@ module RailsSemanticLogger
         end
       end
 
-      def log_with_formatter(**kw_args)
+      def log_with_formatter(level: :info, **kw_args)
         fmt = EventFormatter.new(**kw_args)
         msg = yield fmt
-        logger.info msg, fmt.payload
+        logger.public_send(level, **msg, payload: fmt.payload)
       end
 
       def logger

data/lib/rails_semantic_logger/active_record/log_subscriber.rb

@@ -42,7 +42,7 @@ module RailsSemanticLogger
 
         # Log the location of the query itself.
         if logger.send(:level_index) >= SemanticLogger.backtrace_level_index
-          log[:backtrace] = SemanticLogger::Utils.strip_backtrace
+          log[:backtrace] = SemanticLogger::Utils.strip_backtrace(caller)
         end
 
         logger.debug(log)
@@ -178,7 +178,7 @@ module RailsSemanticLogger
           attr = nil
         end
 
-        [attr&.name, value]
+        [attr&.name || :nil, value]
       end
 
       def type_casted_binds_v5_0_3(binds, casted_binds)

data/lib/rails_semantic_logger/engine.rb

@@ -214,6 +214,15 @@ module RailsSemanticLogger
 
       # Re-open appenders after Spring has forked a process
       Spring.after_fork { |_job| ::SemanticLogger.reopen } if defined?(Spring.after_fork)
+
+      console do |_app|
+        # Don't use a background thread for logging
+        SemanticLogger.sync!
+        SemanticLogger.add_appender(io: STDERR, formatter: :color)
+
+        # Include method names on log entries in the console
+        SemanticLogger.backtrace_level = SemanticLogger.default_level
+      end
     end
   end
 end

data/lib/rails_semantic_logger/extensions/active_support/logger.rb

@@ -0,0 +1,20 @@
+require "active_support/logger"
+
+module ActiveSupport
+  # More hacks to try and stop Rails from being it's own worst enemy.
+  class Logger
+    # Prevent Console from trying to merge loggers
+    def self.logger_outputs_to?(*args)
+      true
+    end
+
+    # Prevent broadcasting since SemanticLogger already supports multiple loggers
+    def self.broadcast(logger)
+      Module.new
+    end
+
+    def self.new(*args, **kwargs)
+      SemanticLogger[self]
+    end
+  end
+end

data/lib/rails_semantic_logger/extensions/active_support/tagged_logging.rb

@@ -0,0 +1,8 @@
+module ActiveSupport
+  module TaggedLogging
+    # Semantic Logger already does tagged logging
+    def self.new(logger)
+      logger
+    end
+  end
+end

data/lib/rails_semantic_logger/extensions/mongoid/config.rb

@@ -0,0 +1,11 @@
+require "mongoid/config"
+
+module Mongoid
+  module Config
+    private
+
+    # Remove log overrides
+    def set_log_levels
+    end
+  end
+end

data/lib/rails_semantic_logger/extensions/rack/server.rb

@@ -0,0 +1,12 @@
+module RailsSemanticLogger
+  module Rack
+    module Server
+      def daemonize_app
+        super
+        SemanticLogger.reopen
+      end
+    end
+  end
+end
+
+Rack::Server.prepend(RailsSemanticLogger::Rack::Server)

data/lib/rails_semantic_logger/extensions/rails/server.rb

@@ -5,6 +5,8 @@ module Rails
     private
 
     def log_to_stdout
+      wrapped_app # touch the app so the logger is set up
+
       SemanticLogger.add_appender(io: $stdout, formatter: :color)
     end
   end

data/lib/rails_semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module RailsSemanticLogger
-  VERSION = "4.5.1".freeze
+  VERSION = "4.6.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_semantic_logger
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.6.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.8'
 description:
 email:
 executables: []
@@ -74,6 +74,10 @@ files:
 - lib/rails_semantic_logger/extensions/action_view/streaming_template_renderer.rb
 - lib/rails_semantic_logger/extensions/active_job/logging.rb
 - lib/rails_semantic_logger/extensions/active_model_serializers/logging.rb
+- lib/rails_semantic_logger/extensions/active_support/logger.rb
+- lib/rails_semantic_logger/extensions/active_support/tagged_logging.rb
+- lib/rails_semantic_logger/extensions/mongoid/config.rb
+- lib/rails_semantic_logger/extensions/rack/server.rb
 - lib/rails_semantic_logger/extensions/rails/server.rb
 - lib/rails_semantic_logger/options.rb
 - lib/rails_semantic_logger/rack/logger.rb
@@ -90,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="