lograge 0.7.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 794cb4f90104c70ec130d7e76616fd5f2f98d635
-  data.tar.gz: 849237755782f80091e100da8980f2eba36e63d3
+SHA256:
+  metadata.gz: a8dc3fd38bfe24b9f1816ac75fa2d600037fd308b1b355de309d81deae032cd9
+  data.tar.gz: f3627f7956278364545987b845a16011463592a78dbf9ae0a409b0c8640b63e4
 SHA512:
-  metadata.gz: ae07fa3866c8deeb9887dee23f8be3b2d8908b55c4adfb1c33e514e49f182077517ea74fca08ecffdca8d133bfb96c68159407092e319a8685be42f31e6fd530
-  data.tar.gz: d1df2bb0c4f4e6c5ae392022f43b11d58fcd70676f6842fd469e74329d2da40d4af68307df8d90699cccc91f29e8f3890f2efb5c04f7b1169bb01c8410bbdcae
+  metadata.gz: 5787201d587cee662987f2aef1db3b971a60b7feec4dc630d509520713e2c746aee9a1249817f0d1bb8752d22eadcf5e79259c73213e75ce7127e49115795b95
+  data.tar.gz: 055daf5493eb1a053a8b995d5037973587782c8edf9a48fd0d860f3d5e5c2bb419957c0df8610eda6e0cc26c54bdcf7bd900ba0113c780c4569fb22330e9b00e

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Mathias Meyer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/lograge/formatters/cee.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lograge
   module Formatters
     class Cee

data/lib/lograge/formatters/graylog2.rb

@@ -1,21 +1,15 @@
+# frozen_string_literal: true
+
 module Lograge
   module Formatters
     class Graylog2
-      def call(data)
-        # Cloning because we don't want to mess with the original when mutating keys.
-        data_clone = data.clone
-
-        base = {
-          short_message: short_message(data_clone)
-        }
+      include Lograge::Formatters::Helpers::MethodAndPath
 
+      def call(data)
         # Add underscore to every key to follow GELF additional field syntax.
-        data_clone.keys.each do |key|
-          data_clone[underscore_prefix(key)] = data_clone[key]
-          data_clone.delete(key)
-        end
-
-        data_clone.merge(base)
+        data.transform_keys { |k| underscore_prefix(k) }.merge(
+          short_message: short_message(data)
+        )
       end
 
       def underscore_prefix(key)
@@ -23,7 +17,7 @@ module Lograge
       end
 
       def short_message(data)
-        "[#{data[:status]}] #{data[:method]} #{data[:path]} (#{data[:controller]}##{data[:action]})"
+        "[#{data[:status]}]#{method_and_path_string(data)}(#{data[:controller]}##{data[:action]})"
       end
     end
   end

data/lib/lograge/formatters/helpers/method_and_path.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Lograge
+  module Formatters
+    module Helpers
+      module MethodAndPath
+        def method_and_path_string(data)
+          method_and_path = [data[:method], data[:path]].compact
+          method_and_path.any?(&:present?) ? " #{method_and_path.join(' ')} " : ' '
+        end
+      end
+    end
+  end
+end

data/lib/lograge/formatters/json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 module Lograge
   module Formatters

data/lib/lograge/formatters/key_value.rb

@@ -1,28 +1,32 @@
+# frozen_string_literal: true
+
 module Lograge
   module Formatters
     class KeyValue
       def call(data)
-        fields = fields_to_display(data)
-
-        event = fields.map { |key| format(key, data[key]) }
-        event.join(' ')
+        fields_to_display(data)
+          .map { |key| format(key, data[key]) }
+          .join(' ')
       end
 
+      protected
+
       def fields_to_display(data)
         data.keys
       end
 
       def format(key, value)
-        if key == :error
-          # Exactly preserve the previous output
-          # Parsing this can be ambigious if the error messages contains
-          # a single quote
-          value = "'#{value}'"
-        elsif value.is_a? Float
-          value = Kernel.format('%.2f', value)
-        end
+        "#{key}=#{parse_value(key, value)}"
+      end
+
+      def parse_value(key, value)
+        # Exactly preserve the previous output
+        # Parsing this can be ambigious if the error messages contains
+        # a single quote
+        return "'#{value}'" if key == :error
+        return Kernel.format('%.2f', value) if value.is_a? Float
 
-        "#{key}=#{value}"
+        value
       end
     end
   end

data/lib/lograge/formatters/l2met.rb

@@ -1,35 +1,48 @@
+# frozen_string_literal: true
+
 require 'lograge/formatters/key_value'
 
 module Lograge
   module Formatters
     class L2met < KeyValue
-      L2MET_FIELDS = [
-        :method,
-        :path,
-        :format,
-        :source,
-        :status,
-        :error,
-        :duration,
-        :view,
-        :db,
-        :location
+      L2MET_FIELDS = %i[
+        method
+        path
+        format
+        source
+        status
+        error
+        duration
+        view
+        db
+        location
+      ].freeze
+
+      UNWANTED_FIELDS = %i[
+        controller
+        action
       ].freeze
 
       def call(data)
         super(modify_payload(data))
       end
 
+      protected
+
+      def fields_to_display(data)
+        L2MET_FIELDS + additional_fields(data)
+      end
+
+      def additional_fields(data)
+        (data.keys - L2MET_FIELDS) - UNWANTED_FIELDS
+      end
+
       def format(key, value)
         key = "measure#page.#{key}" if value.is_a?(Float)
 
         super(key, value)
       end
 
-      def fields_to_display(data)
-        L2MET_FIELDS + (data.keys - L2MET_FIELDS) - [:controller, :action]
-      end
-
       def modify_payload(data)
         data[:source] = source_field(data) if data[:controller] && data[:action]
 

data/lib/lograge/formatters/lines.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lograge
   module Formatters
     class Lines

data/lib/lograge/formatters/logstash.rb

@@ -1,11 +1,15 @@
+# frozen_string_literal: true
+
 module Lograge
   module Formatters
     class Logstash
+      include Lograge::Formatters::Helpers::MethodAndPath
+
       def call(data)
         load_dependencies
         event = LogStash::Event.new(data)
 
-        event['message'] = "[#{data[:status]}] #{data[:method]} #{data[:path]} (#{data[:controller]}##{data[:action]})"
+        event['message'] = "[#{data[:status]}]#{method_and_path_string(data)}(#{data[:controller]}##{data[:action]})"
         event.to_json
       end
 

data/lib/lograge/formatters/ltsv.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lograge
   module Formatters
     class LTSV

data/lib/lograge/formatters/raw.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lograge
   module Formatters
     class Raw

data/lib/lograge/log_subscribers/action_cable.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Lograge
+  module LogSubscribers
+    class ActionCable < Base
+      %i[perform_action subscribe unsubscribe connect disconnect].each do |method_name|
+        define_method(method_name) do |event|
+          process_main_event(event)
+        end
+      end
+
+      private
+
+      def initial_data(payload)
+        {
+          method: nil,
+          path: nil,
+          format: nil,
+          params: payload[:data],
+          controller: payload[:channel_class] || payload[:connection_class],
+          action: payload[:action]
+        }
+      end
+
+      def default_status
+        200
+      end
+
+      def extract_runtimes(event, _payload)
+        { duration: event.duration.to_f.round(2) }
+      end
+    end
+  end
+end

data/lib/lograge/log_subscribers/action_controller.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Lograge
+  module LogSubscribers
+    class ActionController < Base
+      def process_action(event)
+        process_main_event(event)
+      end
+
+      def redirect_to(event)
+        RequestStore.store[:lograge_location] = event.payload[:location]
+      end
+
+      def unpermitted_parameters(event)
+        RequestStore.store[:lograge_unpermitted_params] ||= []
+        RequestStore.store[:lograge_unpermitted_params].concat(event.payload[:keys])
+      end
+
+      private
+
+      def initial_data(payload)
+        {
+          method: payload[:method],
+          path: extract_path(payload),
+          format: extract_format(payload),
+          controller: payload[:controller],
+          action: payload[:action]
+        }
+      end
+
+      def extract_path(payload)
+        path = payload[:path]
+        strip_query_string(path)
+      end
+
+      def strip_query_string(path)
+        index = path.index('?')
+        index ? path[0, index] : path
+      end
+
+      if ::ActionPack::VERSION::MAJOR == 3 && ::ActionPack::VERSION::MINOR.zero?
+        def extract_format(payload)
+          payload[:formats].first
+        end
+      else
+        def extract_format(payload)
+          payload[:format]
+        end
+      end
+
+      def extract_runtimes(event, payload)
+        data = { duration: event.duration.to_f.round(2) }
+        data[:view] = payload[:view_runtime].to_f.round(2) if payload.key?(:view_runtime)
+        data[:db] = payload[:db_runtime].to_f.round(2) if payload.key?(:db_runtime)
+        data
+      end
+
+      def extract_location
+        location = RequestStore.store[:lograge_location]
+        return {} unless location
+
+        RequestStore.store[:lograge_location] = nil
+        { location: strip_query_string(location) }
+      end
+
+      def extract_unpermitted_params
+        unpermitted_params = RequestStore.store[:lograge_unpermitted_params]
+        return {} unless unpermitted_params
+
+        RequestStore.store[:lograge_unpermitted_params] = nil
+        { unpermitted_params: unpermitted_params }
+      end
+    end
+  end
+end

data/lib/lograge/log_subscribers/base.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'action_pack'
+require 'active_support'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/log_subscriber'
+require 'request_store'
+
+module Lograge
+  module LogSubscribers
+    class Base < ActiveSupport::LogSubscriber
+      def logger
+        Lograge.logger.presence || super
+      end
+
+      private
+
+      def process_main_event(event)
+        return if Lograge.ignore?(event)
+
+        payload = event.payload
+        data = extract_request(event, payload)
+        data = before_format(data, payload)
+        formatted_message = Lograge.formatter.call(data)
+        logger.send(Lograge.log_level, formatted_message)
+      end
+
+      def extract_request(event, payload)
+        data = initial_data(payload)
+        data.merge!(extract_status(payload))
+        data.merge!(extract_runtimes(event, payload))
+        data.merge!(extract_location)
+        data.merge!(extract_unpermitted_params)
+        data.merge!(custom_options(event))
+      end
+
+      %i[initial_data extract_status extract_runtimes
+         extract_location extract_unpermitted_params].each do |method_name|
+        define_method(method_name) { |*_arg| {} }
+      end
+
+      def extract_status(payload)
+        if (status = payload[:status])
+          { status: status.to_i }
+        elsif (error = payload[:exception])
+          exception, message = error
+          { status: get_error_status_code(exception), error: "#{exception}: #{message}" }
+        else
+          { status: default_status }
+        end
+      end
+
+      def default_status
+        0
+      end
+
+      def get_error_status_code(exception_class_name)
+        ActionDispatch::ExceptionWrapper.status_code_for_exception(exception_class_name)
+      end
+
+      def custom_options(event)
+        options = Lograge.custom_options(event) || {}
+        options.merge event.payload[:custom_payload] || {}
+      end
+
+      def before_format(data, payload)
+        Lograge.before_format(data, payload)
+      end
+    end
+  end
+end

data/lib/lograge/ordered_options.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'active_support'
 require 'active_support/ordered_options'
 
 module Lograge

data/lib/lograge/rails_ext/action_cable/channel/base.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Lograge
+  module ActionCable
+    module ChannelInstrumentation
+      def subscribe_to_channel
+        ActiveSupport::Notifications.instrument('subscribe.action_cable', notification_payload('subscribe')) { super }
+      end
+
+      def unsubscribe_from_channel
+        ActiveSupport::Notifications.instrument('unsubscribe.action_cable', notification_payload('unsubscribe')) do
+          super
+        end
+      end
+
+      private
+
+      def notification_payload(method_name)
+        { channel_class: self.class.name, action: method_name }
+      end
+    end
+  end
+end
+
+ActionCable::Channel::Base.prepend(Lograge::ActionCable::ChannelInstrumentation)

data/lib/lograge/rails_ext/action_cable/connection/base.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Lograge
+  module ActionCable
+    module ConnectionInstrumentation
+      def handle_open
+        ActiveSupport::Notifications.instrument('connect.action_cable', notification_payload('connect')) { super }
+      end
+
+      def handle_close
+        ActiveSupport::Notifications.instrument('disconnect.action_cable', notification_payload('disconnect')) { super }
+      end
+
+      def notification_payload(method_name)
+        { connection_class: self.class.name, action: method_name, data: request.params }
+      end
+    end
+  end
+end
+
+ActionCable::Connection::Base.prepend(Lograge::ActionCable::ConnectionInstrumentation)

data/lib/lograge/rails_ext/action_cable/server/base.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module ActionCable
+  module Server
+    class Base
+      mattr_accessor :logger
+      self.logger = Lograge::SilentLogger.new(config.logger)
+    end
+  end
+end

data/lib/lograge/rails_ext/rack/logger.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'active_support'
 require 'active_support/concern'
 require 'rails/rack/logger'
 
@@ -9,17 +12,19 @@ module Rails
     # that say:
     # Started GET / for 192.168.2.1...
     class Logger
-      # Overwrites Rails 3.2 code that logs new requests
+      # Overwrites Rails code that logs new requests
       def call_app(*args)
         env = args.last
-        @app.call(env)
+        status, headers, body = @app.call(env)
+        # needs to have same return type as the Rails builtins being overridden, see https://github.com/roidrage/lograge/pull/333
+        # https://github.com/rails/rails/blob/be9d34b9bcb448b265114ebc28bef1a5b5e4c272/railties/lib/rails/rack/logger.rb#L37
+        [status, headers, ::Rack::BodyProxy.new(body) {}] # rubocop:disable Lint/EmptyBlock
       ensure
         ActiveSupport::LogSubscriber.flush_all!
       end
 
       # Overwrites Rails 3.0/3.1 code that logs new requests
-      def before_dispatch(_env)
-      end
+      def before_dispatch(_env); end
     end
   end
 end

data/lib/lograge/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/railtie'
 require 'action_view/log_subscriber'
 require 'action_controller/log_subscriber'

data/lib/lograge/silent_logger.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'delegate'
+
+module Lograge
+  class SilentLogger < SimpleDelegator
+    %i[debug info warn error fatal unknown].each do |method_name|
+      # rubocop:disable Lint/EmptyBlock
+      define_method(method_name) { |*_args| }
+      # rubocop:enable Lint/EmptyBlock
+    end
+  end
+end

data/lib/lograge/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Lograge
-  VERSION = '0.7.1'.freeze
+  VERSION = '0.12.0'
 end

data/lib/lograge.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'lograge/version'
+require 'lograge/formatters/helpers/method_and_path'
 require 'lograge/formatters/cee'
 require 'lograge/formatters/json'
 require 'lograge/formatters/graylog2'
@@ -8,12 +11,16 @@ require 'lograge/formatters/lines'
 require 'lograge/formatters/logstash'
 require 'lograge/formatters/ltsv'
 require 'lograge/formatters/raw'
-require 'lograge/log_subscriber'
+require 'lograge/log_subscribers/base'
+require 'lograge/log_subscribers/action_cable'
+require 'lograge/log_subscribers/action_controller'
+require 'lograge/silent_logger'
 require 'lograge/ordered_options'
+require 'active_support'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
 
-# rubocop:disable ModuleLength
+# rubocop:disable Metrics/ModuleLength
 module Lograge
   module_function
 
@@ -63,10 +70,14 @@ module Lograge
   def ignore_actions(actions)
     ignore(lambda do |event|
              params = event.payload
-             Array(actions).include?("#{params[:controller]}##{params[:action]}")
+             Array(actions).include?("#{controller_field(params)}##{params[:action]}")
            end)
   end
 
+  def controller_field(params)
+    params[:controller] || params[:channel_class] || params[:connection_class]
+  end
+
   def ignore_tests
     @ignore_tests ||= []
   end
@@ -109,9 +120,7 @@ module Lograge
     events = subscriber.public_methods(false).reject { |method| method.to_s == 'call' }
     events.each do |event|
       ActiveSupport::Notifications.notifier.listeners_for("#{event}.#{component}").each do |listener|
-        if listener.instance_variable_get('@delegate') == subscriber
-          ActiveSupport::Notifications.unsubscribe listener
-        end
+        ActiveSupport::Notifications.unsubscribe listener if listener.instance_variable_get('@delegate') == subscriber
       end
     end
   end
@@ -122,6 +131,8 @@ module Lograge
     keep_original_rails_log
 
     attach_to_action_controller
+    attach_to_action_cable if defined?(ActionCable)
+
     set_lograge_log_options
     setup_custom_payload
     support_deprecated_config # TODO: Remove with version 1.0
@@ -139,16 +150,33 @@ module Lograge
   end
 
   def attach_to_action_controller
-    Lograge::RequestLogSubscriber.attach_to :action_controller
+    Lograge::LogSubscribers::ActionController.attach_to :action_controller
+  end
+
+  def attach_to_action_cable
+    require 'lograge/rails_ext/action_cable/channel/base'
+    require 'lograge/rails_ext/action_cable/connection/base'
+
+    Lograge::LogSubscribers::ActionCable.attach_to :action_cable
   end
 
   def setup_custom_payload
     return unless lograge_config.custom_payload_method.respond_to?(:call)
-    base_controller_class = lograge_config.base_controller_class.try(:constantize) || ActionController::Base
-    append_payload_method = base_controller_class.instance_method(:append_info_to_payload)
+
+    base_classes = Array(lograge_config.base_controller_class)
+    base_classes.map! { |klass| klass.try(:constantize) }
+    base_classes << ActionController::Base if base_classes.empty?
+
+    base_classes.each do |base_class|
+      extend_base_class(base_class)
+    end
+  end
+
+  def extend_base_class(klass)
+    append_payload_method = klass.instance_method(:append_info_to_payload)
     custom_payload_method = lograge_config.custom_payload_method
 
-    base_controller_class.send(:define_method, :append_info_to_payload) do |payload|
+    klass.send(:define_method, :append_info_to_payload) do |payload|
       append_payload_method.bind(self).call(payload)
       payload[:custom_payload] = custom_payload_method.call(self)
     end
@@ -169,11 +197,14 @@ module Lograge
     return if lograge_config.keep_original_rails_log
 
     require 'lograge/rails_ext/rack/logger'
+
+    require 'lograge/rails_ext/action_cable/server/base' if defined?(ActionCable)
+
     Lograge.remove_existing_log_subscriptions
   end
 
   def rack_cache_hashlike?(app)
-    app.config.action_dispatch.rack_cache && app.config.action_dispatch.rack_cache.respond_to?(:[]=)
+    app.config.action_dispatch.rack_cache&.respond_to?(:[]=)
   end
   private_class_method :rack_cache_hashlike?
 
@@ -193,5 +224,6 @@ module Lograge
     application.config.lograge
   end
 end
+# rubocop:enable Metrics/ModuleLength
 
 require 'lograge/railtie' if defined?(Rails)

metadata

@@ -1,129 +1,129 @@
 --- !ruby/object:Gem::Specification
 name: lograge
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Mathias Meyer
 - Ben Lovell
-autorequire: 
+- Michael Bianco
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: '1.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: '1.23'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
-    - - <
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Tame Rails' multi-line logging into a single line per request
 email:
 - meyer@paperplanes.de
 - benjamin.lovell@gmail.com
+- mike@mikebian.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
 - lib/lograge.rb
 - lib/lograge/formatters/cee.rb
 - lib/lograge/formatters/graylog2.rb
+- lib/lograge/formatters/helpers/method_and_path.rb
 - lib/lograge/formatters/json.rb
 - lib/lograge/formatters/key_value.rb
 - lib/lograge/formatters/l2met.rb
@@ -131,33 +131,39 @@ files:
 - lib/lograge/formatters/logstash.rb
 - lib/lograge/formatters/ltsv.rb
 - lib/lograge/formatters/raw.rb
-- lib/lograge/log_subscriber.rb
+- lib/lograge/log_subscribers/action_cable.rb
+- lib/lograge/log_subscribers/action_controller.rb
+- lib/lograge/log_subscribers/base.rb
 - lib/lograge/ordered_options.rb
+- lib/lograge/rails_ext/action_cable/channel/base.rb
+- lib/lograge/rails_ext/action_cable/connection/base.rb
+- lib/lograge/rails_ext/action_cable/server/base.rb
 - lib/lograge/rails_ext/rack/logger.rb
 - lib/lograge/railtie.rb
+- lib/lograge/silent_logger.rb
 - lib/lograge/version.rb
 homepage: https://github.com/roidrage/lograge
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Tame Rails' multi-line logging into a single line per request
 test_files: []

data/lib/lograge/log_subscriber.rb

@@ -1,118 +0,0 @@
-require 'json'
-require 'action_pack'
-require 'active_support/core_ext/class/attribute'
-require 'active_support/log_subscriber'
-require 'request_store'
-
-module Lograge
-  class RequestLogSubscriber < ActiveSupport::LogSubscriber
-    def process_action(event)
-      return if Lograge.ignore?(event)
-
-      payload = event.payload
-      data = extract_request(event, payload)
-      data = before_format(data, payload)
-      formatted_message = Lograge.formatter.call(data)
-      logger.send(Lograge.log_level, formatted_message)
-    end
-
-    def redirect_to(event)
-      RequestStore.store[:lograge_location] = event.payload[:location]
-    end
-
-    def unpermitted_parameters(event)
-      RequestStore.store[:lograge_unpermitted_params] ||= []
-      RequestStore.store[:lograge_unpermitted_params].concat(event.payload[:keys])
-    end
-
-    def logger
-      Lograge.logger.presence || super
-    end
-
-    private
-
-    def extract_request(event, payload)
-      payload = event.payload
-      data = initial_data(payload)
-      data.merge!(extract_status(payload))
-      data.merge!(extract_runtimes(event, payload))
-      data.merge!(extract_location)
-      data.merge!(extract_unpermitted_params)
-      data.merge!(custom_options(event))
-    end
-
-    def initial_data(payload)
-      {
-        method: payload[:method],
-        path: extract_path(payload),
-        format: extract_format(payload),
-        controller: payload[:controller],
-        action: payload[:action]
-      }
-    end
-
-    def extract_path(payload)
-      path = payload[:path]
-      index = path.index('?')
-      index ? path[0, index] : path
-    end
-
-    if ::ActionPack::VERSION::MAJOR == 3 && ::ActionPack::VERSION::MINOR.zero?
-      def extract_format(payload)
-        payload[:formats].first
-      end
-    else
-      def extract_format(payload)
-        payload[:format]
-      end
-    end
-
-    def extract_status(payload)
-      if (status = payload[:status])
-        { status: status.to_i }
-      elsif (error = payload[:exception])
-        exception, message = error
-        { status: get_error_status_code(exception), error: "#{exception}: #{message}" }
-      else
-        { status: 0 }
-      end
-    end
-
-    def get_error_status_code(exception)
-      status = ActionDispatch::ExceptionWrapper.rescue_responses[exception]
-      Rack::Utils.status_code(status)
-    end
-
-    def custom_options(event)
-      options = Lograge.custom_options(event) || {}
-      options.merge event.payload[:custom_payload] || {}
-    end
-
-    def before_format(data, payload)
-      Lograge.before_format(data, payload)
-    end
-
-    def extract_runtimes(event, payload)
-      data = { duration: event.duration.to_f.round(2) }
-      data[:view] = payload[:view_runtime].to_f.round(2) if payload.key?(:view_runtime)
-      data[:db] = payload[:db_runtime].to_f.round(2) if payload.key?(:db_runtime)
-      data
-    end
-
-    def extract_location
-      location = RequestStore.store[:lograge_location]
-      return {} unless location
-
-      RequestStore.store[:lograge_location] = nil
-      { location: location }
-    end
-
-    def extract_unpermitted_params
-      unpermitted_params = RequestStore.store[:lograge_unpermitted_params]
-      return {} unless unpermitted_params
-
-      RequestStore.store[:lograge_unpermitted_params] = nil
-      { unpermitted_params: unpermitted_params }
-    end
-  end
-end