Skip to content

Prefer ActiveRecord::Base.logger instead of a custom logger instance in RailsSemanticLogger::ActiveRecord::LogSubscriber #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prefer ActiveRecord::Base.logger instead of a custom logger instance in RailsSemanticLogger::ActiveRecord::LogSubscriber #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions lib/rails_semantic_logger/active_record/log_subscriber.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ module ActiveRecord
class LogSubscriber < ActiveSupport::LogSubscriber
IGNORE_PAYLOAD_NAMES = %w[SCHEMA EXPLAIN].freeze

class << self
attr_reader :logger
end

def self.runtime=(value)
::ActiveRecord::RuntimeRegistry.sql_runtime = value
end
Expand Down Expand Up @@ -50,8 +46,6 @@ def sql(event)

private

@logger = SemanticLogger["ActiveRecord"]

# When multiple values are received for a single bound field, it is converted into an array
def add_bind_value(binds, key, value)
key = key.downcase.to_sym unless key.nil?
Expand All @@ -60,7 +54,7 @@ def add_bind_value(binds, key, value)
end

def logger
self.class.logger
::ActiveRecord::Base.logger
end

#
Expand Down
12 changes: 6 additions & 6 deletions test/active_record_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class ActiveRecordTest < Minitest::Test
assert_semantic_logger_event(
messages[0],
level: :debug,
name: "ActiveRecord",
name: "ActiveRecord::Base",
message: "Sample Load",
payload_includes: {
sql: expected_sql,
Expand All @@ -38,7 +38,7 @@ class ActiveRecordTest < Minitest::Test
assert_semantic_logger_event(
messages[0],
level: :debug,
name: "ActiveRecord",
name: "ActiveRecord::Base",
message: "Sample Load",
payload_includes: {
sql: expected_sql,
Expand All @@ -50,7 +50,7 @@ class ActiveRecordTest < Minitest::Test
assert_semantic_logger_event(
messages[1],
level: :debug,
name: "ActiveRecord",
name: "ActiveRecord::Base",
message: "Sample Load",
payload_includes: {
sql: expected_sql,
Expand All @@ -77,7 +77,7 @@ class ActiveRecordTest < Minitest::Test
assert_semantic_logger_event(
messages[0],
level: :debug,
name: "ActiveRecord",
name: "ActiveRecord::Base",
message: "Sample Load",
payload_includes: {
sql: expected_sql,
Expand All @@ -100,7 +100,7 @@ class ActiveRecordTest < Minitest::Test
assert_semantic_logger_event(
messages[0],
level: :debug,
name: "ActiveRecord",
name: "ActiveRecord::Base",
message: "Sample Load",
payload_includes: {
sql: expected_sql,
Expand All @@ -123,7 +123,7 @@ class ActiveRecordTest < Minitest::Test
assert_semantic_logger_event(
messages[0],
level: :debug,
name: "ActiveRecord",
name: "ActiveRecord::Base",
message: "Sample Load",
payload_includes: {
sql: expected_sql,
Expand Down