aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/lib
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-06-17 13:07:33 -0400
committerGitHub <noreply@github.com>2016-06-17 13:07:33 -0400
commit94ef224aa61ace3fa643eab161ff9056b7d90a62 (patch)
treef4cb10eadb3eaddbe6a787d179e55fffa1040711 /activejob/lib
parent6d4df1d3305ecacae26cfde71d06bd374c245418 (diff)
parentbe491ecec28cb644c3cbfa785c0313e4eccc49af (diff)
downloadrails-94ef224aa61ace3fa643eab161ff9056b7d90a62.tar.gz
rails-94ef224aa61ace3fa643eab161ff9056b7d90a62.tar.bz2
rails-94ef224aa61ace3fa643eab161ff9056b7d90a62.zip
Merge pull request #25426 from Shopify/fix-activejob-logger
Fix jobs overriding AJ::Base#logger
Diffstat (limited to 'activejob/lib')
-rw-r--r--activejob/lib/active_job/logging.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activejob/lib/active_job/logging.rb b/activejob/lib/active_job/logging.rb
index 605057d1e8..d5c7920131 100644
--- a/activejob/lib/active_job/logging.rb
+++ b/activejob/lib/active_job/logging.rb
@@ -41,7 +41,7 @@ module ActiveJob
def tag_logger(*tags)
if logger.respond_to?(:tagged)
tags.unshift "ActiveJob" unless logger_tagged_by_active_job?
- ActiveJob::Base.logger.tagged(*tags){ yield }
+ logger.tagged(*tags){ yield }
else
yield
end