rails_semantic_logger 4.12.0 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73a37ac27f2cf94d083cc75aa557a778f32e2de852b3be6447b072dc1da89047
-  data.tar.gz: 681f2145e71def6b336792fe3d581dfd89da6fd3ca471befcbd8ffa4f11abb50
+  metadata.gz: b41a1fee07d074d18bcaed7538592f123ecbbbe0f232b52cbca96133654ac256
+  data.tar.gz: df2d6ef10cb8aa051f56a3b916064d1c51afcc3c9ef6f834c2c26be5a3dfc9b4
 SHA512:
-  metadata.gz: 8d299a14cb4c3eaf282e4bf502d8e60c2a36095b138c17969cf0a8f79b0431a731adbe8963ae2017bf429f12b7f42fe65d5c199a2c5f88e984a71d4605766bea
-  data.tar.gz: d837dc46c0dcd38b19dcf2a62c926c91ef1775542d55c8919d3a76db2e62764ab8675890238da78ab19b157f3b920e9d92257d5b2e347bb66d0c5a2bde60441f
+  metadata.gz: 70dec27d9976ae2edfc028bdfd03f51b3eade4cf1562681096ba3a882e2f0aacc9fba893cacd5ac7604f3810b2d6e3b880d2411d78a4372ad5b53ab579e41878
+  data.tar.gz: 635c69136356a8c3ad62a81e0b2db7e397031878619c381fe52240405c2c0b720b9f4900fc2d2ae886d8c23943f8ebd1649444b35357c6178016bb99f036e7dd

data/lib/rails_semantic_logger/action_controller/log_subscriber.rb

@@ -14,10 +14,10 @@ module RailsSemanticLogger
 
           # Unused, but needed for Devise 401 status code monkey patch to still work.
           ::ActionController::Base.log_process_action(payload)
-          
+
           params = payload[:params]
 
-          if params.kind_of?(Hash) || params.kind_of?(::ActionController::Parameters)
+          if params.is_a?(Hash) || params.is_a?(::ActionController::Parameters)
             # According to PR https://github.com/reidmorrison/rails_semantic_logger/pull/37/files
             # params is not always a Hash.
             payload[:params] = params.to_unsafe_h unless params.is_a?(Hash)
@@ -79,7 +79,9 @@ module RailsSemanticLogger
       end
 
       def send_data(event)
-        controller_logger(event).info(message: "Sent data", payload: {file_name: event.payload[:filename]}, duration: event.duration)
+        controller_logger(event).info(message:  "Sent data",
+                                      payload:  {file_name: event.payload[:filename]},
+                                      duration: event.duration)
       end
 
       def unpermitted_parameters(event)

data/lib/rails_semantic_logger/action_mailer/log_subscriber.rb

@@ -9,22 +9,22 @@ module RailsSemanticLogger
         message_id = event.payload[:message_id]
         duration = event.duration.round(1)
         if ex
-          log_with_formatter event: event, log_duration: true, level: :error do |fmt|
+          log_with_formatter event: event, log_duration: true, level: :error do |_fmt|
             {
-              message: "Error delivering mail #{message_id} (#{duration}ms)",
+              message:   "Error delivering mail #{message_id} (#{duration}ms)",
               exception: ex
             }
           end
         else
-          message = begin
+          message =
             if event.payload[:perform_deliveries]
               "Delivered mail #{message_id} (#{duration}ms)"
             else
               "Skipped delivery of mail #{message_id} as `perform_deliveries` is false"
             end
-          end
-          log_with_formatter event: event, log_duration: true do |fmt|
-            { message: message }
+
+          log_with_formatter event: event, log_duration: true do |_fmt|
+            {message: message}
           end
         end
       end
@@ -34,8 +34,8 @@ module RailsSemanticLogger
         mailer   = event.payload[:mailer]
         action   = event.payload[:action]
         duration = event.duration.round(1)
-        log_with_formatter event: event do |fmt|
-          { message: "#{mailer}##{action}: processed outbound mail in #{duration}ms" }
+        log_with_formatter event: event do |_fmt|
+          {message: "#{mailer}##{action}: processed outbound mail in #{duration}ms"}
         end
       end
 
@@ -74,8 +74,6 @@ module RailsSemanticLogger
             event.payload[:date].to_time.utc
           elsif event.payload[:date].is_a?(String)
             Time.parse(date).utc
-          else
-            nil
           end
         end
 
@@ -92,10 +90,10 @@ module RailsSemanticLogger
         end
 
         def formatted_args
-          if defined?(mailer.contantize.log_arguments?) && !mailer.contantize.log_arguments?
+          if defined?(mailer.constantize.log_arguments?) && !mailer.constantize.log_arguments?
             ""
-          else
-            JSON.pretty_generate(event.payload[:args].map { |arg| format(arg) }) if event.payload[:args].present?
+          elsif event.payload[:args].present?
+            JSON.pretty_generate(event.payload[:args].map { |arg| format(arg) })
           end
         end
 

data/lib/rails_semantic_logger/action_view/log_subscriber.rb

@@ -22,7 +22,7 @@ module RailsSemanticLogger
         payload = {
           template: from_rails_root(event.payload[:identifier])
         }
-        payload[:within] = from_rails_root(event.payload[:layout]) if event.payload[:layout]
+        payload[:within]      = from_rails_root(event.payload[:layout]) if event.payload[:layout]
         payload[:allocations] = event.allocations if event.respond_to?(:allocations)
 
         logger.measure(
@@ -39,8 +39,8 @@ module RailsSemanticLogger
         payload = {
           partial: from_rails_root(event.payload[:identifier])
         }
-        payload[:within] = from_rails_root(event.payload[:layout]) if event.payload[:layout]
-        payload[:cache]  = event.payload[:cache_hit] unless event.payload[:cache_hit].nil?
+        payload[:within]      = from_rails_root(event.payload[:layout]) if event.payload[:layout]
+        payload[:cache]       = event.payload[:cache_hit] unless event.payload[:cache_hit].nil?
         payload[:allocations] = event.allocations if event.respond_to?(:allocations)
 
         logger.measure(
@@ -60,7 +60,7 @@ module RailsSemanticLogger
           template: from_rails_root(identifier),
           count:    event.payload[:count]
         }
-        payload[:cache_hits] = event.payload[:cache_hits] if event.payload[:cache_hits]
+        payload[:cache_hits]  = event.payload[:cache_hits] if event.payload[:cache_hits]
         payload[:allocations] = event.allocations if event.respond_to?(:allocations)
 
         logger.measure(
@@ -72,16 +72,61 @@ module RailsSemanticLogger
       end
 
       def start(name, id, payload)
-        if (name == "render_template.action_view") && should_log?
+        if ["render_template.action_view", "render_layout.action_view"].include?(name) && should_log?
+          qualifier        = " layout" if name == "render_layout.action_view"
           payload          = {template: from_rails_root(payload[:identifier])}
           payload[:within] = from_rails_root(payload[:layout]) if payload[:layout]
 
-          logger.send(self.class.rendered_log_level, message: "Rendering", payload: payload)
+          logger.send(self.class.rendered_log_level, message: "Rendering#{qualifier}", payload: payload)
         end
 
         super
       end
 
+      if (Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR >= 1) || Rails::VERSION::MAJOR > 7
+        class Start
+          def start(name, _id, payload)
+            return unless %w[render_template.action_view render_layout.action_view].include?(name)
+
+            qualifier        = " layout" if name == "render_layout.action_view"
+            payload          = {template: from_rails_root(payload[:identifier])}
+            payload[:within] = from_rails_root(payload[:layout]) if payload[:layout]
+
+            logger.debug(message: "Rendering#{qualifier}", payload: payload)
+          end
+
+          def finish(name, id, payload)
+          end
+
+          private
+
+          def from_rails_root(string)
+            string = string.sub(rails_root, "")
+            string.sub!(VIEWS_PATTERN, "")
+            string
+          end
+
+          def rails_root
+            @root ||= "#{Rails.root}/"
+          end
+
+          def logger
+            @logger ||= SemanticLogger["ActionView"]
+          end
+        end
+
+        def self.attach_to(*)
+          ActiveSupport::Notifications.unsubscribe("render_template.action_view")
+          ActiveSupport::Notifications.unsubscribe("render_layout.action_view")
+          ActiveSupport::Notifications.subscribe("render_template.action_view",
+                                                 RailsSemanticLogger::ActionView::LogSubscriber::Start.new)
+          ActiveSupport::Notifications.subscribe("render_layout.action_view",
+                                                 RailsSemanticLogger::ActionView::LogSubscriber::Start.new)
+
+          super
+        end
+      end
+
       private
 
       @logger             = SemanticLogger["ActionView"]

data/lib/rails_semantic_logger/active_job/log_subscriber.rb

@@ -4,14 +4,44 @@ module RailsSemanticLogger
   module ActiveJob
     class LogSubscriber < ::ActiveSupport::LogSubscriber
       def enqueue(event)
-        log_with_formatter event: event do |fmt|
-          {message: "Enqueued #{fmt.job_info}"}
+        ex = event.payload[:exception_object]
+
+        if ex
+          log_with_formatter level: :error, event: event do |fmt|
+            {
+              message:   "Failed enqueuing #{fmt.job_info} (#{ex.class} (#{ex.message})",
+              exception: ex
+            }
+          end
+        elsif event.payload[:aborted]
+          log_with_formatter level: :info, event: event do |fmt|
+            {message: "Failed enqueuing #{fmt.job_info}, a before_enqueue callback halted the enqueuing execution."}
+          end
+        else
+          log_with_formatter event: event do |fmt|
+            {message: "Enqueued #{fmt.job_info}"}
+          end
         end
       end
 
       def enqueue_at(event)
-        log_with_formatter event: event do |fmt|
-          {message: "Enqueued #{fmt.job_info} at #{fmt.scheduled_at}"}
+        ex = event.payload[:exception_object]
+
+        if ex
+          log_with_formatter level: :error, event: event do |fmt|
+            {
+              message:   "Failed enqueuing #{fmt.job_info} (#{ex.class} (#{ex.message})",
+              exception: ex
+            }
+          end
+        elsif event.payload[:aborted]
+          log_with_formatter level: :info, event: event do |fmt|
+            {message: "Failed enqueuing #{fmt.job_info}, a before_enqueue callback halted the enqueuing execution."}
+          end
+        else
+          log_with_formatter event: event do |fmt|
+            {message: "Enqueued #{fmt.job_info} at #{fmt.scheduled_at}"}
+          end
         end
       end
 
@@ -26,7 +56,7 @@ module RailsSemanticLogger
         if 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",
+              message:   "Error performing #{fmt.job_info} in #{event.duration.round(2)}ms",
               exception: ex
             }
           end

data/lib/rails_semantic_logger/active_record/log_subscriber.rb

@@ -169,9 +169,7 @@ module RailsSemanticLogger
       def render_bind_v6_1(attr, value)
         case attr
         when ActiveModel::Attribute
-          if attr.type.binary? && attr.value
-            value = "<#{attr.value_for_database.to_s.bytesize} bytes of binary data>"
-          end
+          value = "<#{attr.value_for_database.to_s.bytesize} bytes of binary data>" if attr.type.binary? && attr.value
         when Array
           attr = attr.first
         else

data/lib/rails_semantic_logger/engine.rb

@@ -77,7 +77,7 @@ module RailsSemanticLogger
           logger = SemanticLogger[Rails]
           logger.warn(
             "Rails Error: Unable to access log file. Please ensure that #{path} exists and is chmod 0666. " \
-              "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed.",
+            "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed.",
             e
           )
           logger
@@ -111,14 +111,14 @@ module RailsSemanticLogger
       if defined?(Sidekiq)
         if Sidekiq.respond_to?(:logger=)
           Sidekiq.logger = SemanticLogger[Sidekiq]
-        elsif Sidekiq::VERSION[0..1] == '7.'
+        elsif Sidekiq::VERSION[0..1] == "7."
           method = Sidekiq.server? ? :configure_server : :configure_client
           Sidekiq.public_send(method) { |cfg| cfg.logger = SemanticLogger[Sidekiq] }
         end
       end
 
       # Replace the Sidetiq logger
-      Sidetiq.logger       = SemanticLogger[Sidetiq] if defined?(Sidetiq) && Sidetiq.respond_to?(:logger=)
+      Sidetiq.logger = SemanticLogger[Sidetiq] if defined?(Sidetiq) && Sidetiq.respond_to?(:logger=)
 
       # Replace the DelayedJob logger
       if defined?(Delayed::Worker)
@@ -127,7 +127,7 @@ module RailsSemanticLogger
       end
 
       # Replace the Bugsnag logger
-      Bugsnag.configure { |config| config.logger = SemanticLogger[Bugsnag] } if defined?(Bugsnag)
+      Bugsnag.configure(false) { |config| config.logger = SemanticLogger[Bugsnag] } if defined?(Bugsnag)
 
       # Set the IOStreams PGP logger
       IOStreams::Pgp.logger = SemanticLogger["IOStreams::Pgp"] if defined?(IOStreams)
@@ -138,12 +138,14 @@ module RailsSemanticLogger
       config = Rails.application.config
 
       # Replace the Bugsnag logger
-      Bugsnag.configure { |bugsnag_config| bugsnag_config.logger = SemanticLogger[Bugsnag] } if defined?(Bugsnag)
+      Bugsnag.configure(false) { |bugsnag_config| bugsnag_config.logger = SemanticLogger[Bugsnag] } if defined?(Bugsnag)
 
       # Rails Patches
       require("rails_semantic_logger/extensions/action_cable/tagged_logger_proxy") if defined?(::ActionCable)
       require("rails_semantic_logger/extensions/action_controller/live") if defined?(::ActionController::Live)
-      require("rails_semantic_logger/extensions/action_dispatch/debug_exceptions") if defined?(::ActionDispatch::DebugExceptions)
+      if defined?(::ActionDispatch::DebugExceptions)
+        require("rails_semantic_logger/extensions/action_dispatch/debug_exceptions")
+      end
       if defined?(::ActionView::StreamingTemplateRenderer::Body)
         require("rails_semantic_logger/extensions/action_view/streaming_template_renderer")
       end

data/lib/rails_semantic_logger/extensions/active_job/logging.rb

@@ -9,7 +9,11 @@ module ActiveJob
 
     undef_method :tag_logger
     def tag_logger(*tags, &block)
-      logger.tagged(*tags, &block)
+      if logger.respond_to?(:tagged)
+        logger.tagged(*tags, &block)
+      else
+        yield
+      end
     end
   end
 end

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

@@ -0,0 +1,13 @@
+if ActiveSupport::VERSION::STRING == "7.1.1"
+  require "active_support/log_subscriber"
+
+  module ActiveSupport
+    class LogSubscriber
+      # @override Rails 7.1
+      def silenced?(event)
+        native_log_level = @event_levels.fetch(event, ::Logger::Severity::FATAL)
+        logger.nil? || SemanticLogger::Levels.index(logger.level) > SemanticLogger::Levels.index(native_log_level)
+      end
+    end
+  end
+end

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

@@ -4,20 +4,23 @@ module ActiveSupport
   # More hacks to try and stop Rails from being it's own worst enemy.
   class Logger
     class << self
-      undef :logger_outputs_to?, :broadcast
+      undef :logger_outputs_to?
+
+      # Prevent broadcasting since SemanticLogger already supports multiple loggers
+      if method_defined?(:broadcast)
+        undef :broadcast
+        def broadcast(_logger)
+          Module.new
+        end
+      end
     end
 
     # Prevent Console from trying to merge loggers
-    def self.logger_outputs_to?(*args)
+    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)
+    def self.new(*_args, **_kwargs)
       SemanticLogger[self]
     end
   end

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

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

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

@@ -4,7 +4,7 @@ require "rails"
 module Rails
   class Server
     private
-    
+
     undef_method :log_to_stdout if method_defined?(:log_to_stdout)
     def log_to_stdout
       wrapped_app # touch the app so the logger is set up

data/lib/rails_semantic_logger/rack/logger.rb

@@ -37,7 +37,7 @@ module RailsSemanticLogger
       def call_app(request, env)
         instrumenter        = ActiveSupport::Notifications.instrumenter
         instrumenter_state  = instrumenter.start "request.action_dispatch", request: request
-        instrumenter_finish = -> () {
+        instrumenter_finish = lambda {
           instrumenter.finish_with_state(instrumenter_state, "request.action_dispatch", request: request)
         }
 

data/lib/rails_semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module RailsSemanticLogger
-  VERSION = "4.12.0".freeze
+  VERSION = "4.14.0".freeze
 end

data/lib/rails_semantic_logger.rb

@@ -6,21 +6,27 @@ module RailsSemanticLogger
   module ActionController
     autoload :LogSubscriber, "rails_semantic_logger/action_controller/log_subscriber"
   end
+
   module ActionMailer
     autoload :LogSubscriber, "rails_semantic_logger/action_mailer/log_subscriber"
   end
+
   module ActionView
     autoload :LogSubscriber, "rails_semantic_logger/action_view/log_subscriber"
   end
+
   module ActiveJob
     autoload :LogSubscriber, "rails_semantic_logger/active_job/log_subscriber"
   end
+
   module ActiveRecord
     autoload :LogSubscriber, "rails_semantic_logger/active_record/log_subscriber"
   end
+
   module Rack
     autoload :Logger, "rails_semantic_logger/rack/logger"
   end
+
   module DelayedJob
     autoload :Plugin, "rails_semantic_logger/delayed_job/plugin"
   end
@@ -48,9 +54,11 @@ module RailsSemanticLogger
   end
 
   def self.subscriber_patterns(subscriber)
-    subscriber.patterns.respond_to?(:keys) ?
-      subscriber.patterns.keys :
+    if subscriber.patterns.respond_to?(:keys)
+      subscriber.patterns.keys
+    else
       subscriber.patterns
+    end
   end
 
   private_class_method :subscriber_patterns, :unattach
@@ -58,4 +66,9 @@ 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)
+require("rails_semantic_logger/extensions/active_support/log_subscriber") if defined?(ActiveSupport::LogSubscriber)
+if defined?(Rackup::Server)
+  require("rails_semantic_logger/extensions/rackup/server")
+elsif defined?(Rack::Server)
+  require("rails_semantic_logger/extensions/rack/server")
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_semantic_logger
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.14.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -75,10 +75,12 @@ 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/log_subscriber.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/rackup/server.rb
 - lib/rails_semantic_logger/extensions/rails/server.rb
 - lib/rails_semantic_logger/options.rb
 - lib/rails_semantic_logger/rack/logger.rb
@@ -89,7 +91,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/reidmorrison/rails_semantic_logger/issues
   documentation_uri: https://logger.rocketjob.io
-  source_code_uri: https://github.com/reidmorrison/rails_semantic_logger/tree/4.12.0
+  source_code_uri: https://github.com/reidmorrison/rails_semantic_logger/tree/v4.14.0
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []