Some stylistics changes

This commit is contained in:
Rafael Mendonça França 2021-08-17 22:18:30 +00:00
parent 3597afc605
commit 8d6073da7d
No known key found for this signature in database
GPG Key ID: FC23B6D0F1EEE948
3 changed files with 7 additions and 4 deletions

@ -91,12 +91,13 @@ class Railtie < Rails::Railtie # :nodoc:
initializer "action_controller.query_log_tags" do |app|
ActiveSupport.on_load(:active_record) do
if app.config.active_record.query_log_tags_enabled && app.config.action_controller.log_query_tags_around_actions != false
ActiveRecord::QueryLogs.taggings.merge! \
ActiveRecord::QueryLogs.taggings.merge!(
controller: -> { context[:controller]&.controller_name },
action: -> { context[:controller]&.action_name },
namespaced_controller: -> { context[:controller]&.class&.name }
)
ActiveRecord::QueryLogs.tags << :controller << :action
ActiveRecord::QueryLogs.tags + [:controller, :action]
ActiveSupport.on_load(:action_controller) do
include ActionController::QueryTags

@ -180,8 +180,9 @@ def exec_query(sql, *args, **kwargs)
end
ActiveSupport.on_load(:active_record) do
ActiveRecord::QueryLogs.taggings.merge! \
ActiveRecord::QueryLogs.taggings.merge!(
socket: -> { ActiveRecord::Base.connection_db_config.socket },
db_host: -> { ActiveRecord::Base.connection_db_config.host },
database: -> { ActiveRecord::Base.connection_db_config.database }
)
end

@ -343,9 +343,10 @@ class Railtie < Rails::Railtie # :nodoc:
initializer "active_record.query_log_tags_config" do |app|
config.after_initialize do
if app.config.active_record.query_log_tags_enabled
ActiveRecord::QueryLogs.taggings.merge! \
ActiveRecord::QueryLogs.taggings.merge!(
application: -> { @application_name ||= Rails.application.class.name.split("::").first },
pid: -> { Process.pid }
)
if app.config.active_record.query_log_tags.present?
ActiveRecord::QueryLogs.tags = app.config.active_record.query_log_tags