Fix jobs overriding AJ::Base#logger
This commit is contained in:
parent
30dd8b2cb0
commit
be491ecec2
|
@ -41,7 +41,7 @@ module ActiveJob
|
||||||
def tag_logger(*tags)
|
def tag_logger(*tags)
|
||||||
if logger.respond_to?(:tagged)
|
if logger.respond_to?(:tagged)
|
||||||
tags.unshift "ActiveJob" unless logger_tagged_by_active_job?
|
tags.unshift "ActiveJob" unless logger_tagged_by_active_job?
|
||||||
ActiveJob::Base.logger.tagged(*tags){ yield }
|
logger.tagged(*tags){ yield }
|
||||||
else
|
else
|
||||||
yield
|
yield
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,6 +3,7 @@ require "active_support/log_subscriber/test_helper"
|
||||||
require 'active_support/core_ext/numeric/time'
|
require 'active_support/core_ext/numeric/time'
|
||||||
require 'jobs/hello_job'
|
require 'jobs/hello_job'
|
||||||
require 'jobs/logging_job'
|
require 'jobs/logging_job'
|
||||||
|
require 'jobs/overridden_logging_job'
|
||||||
require 'jobs/nested_job'
|
require 'jobs/nested_job'
|
||||||
require 'models/person'
|
require 'models/person'
|
||||||
|
|
||||||
|
@ -41,7 +42,6 @@ class LoggingTest < ActiveSupport::TestCase
|
||||||
ActiveJob::Base.logger = logger
|
ActiveJob::Base.logger = logger
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def test_uses_active_job_as_tag
|
def test_uses_active_job_as_tag
|
||||||
HelloJob.perform_later "Cristian"
|
HelloJob.perform_later "Cristian"
|
||||||
assert_match(/\[ActiveJob\]/, @logger.messages)
|
assert_match(/\[ActiveJob\]/, @logger.messages)
|
||||||
|
@ -119,4 +119,9 @@ class LoggingTest < ActiveSupport::TestCase
|
||||||
rescue NotImplementedError
|
rescue NotImplementedError
|
||||||
skip
|
skip
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_for_tagged_logger_support_is_consistent
|
||||||
|
set_logger ::Logger.new(nil)
|
||||||
|
OverriddenLoggingJob.perform_later "Dummy"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
class OverriddenLoggingJob < ActiveJob::Base
|
||||||
|
def perform(dummy)
|
||||||
|
logger.info "Dummy, here is it: #{dummy}"
|
||||||
|
end
|
||||||
|
|
||||||
|
def logger
|
||||||
|
@logger ||= ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(nil))
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue