aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/lib/active_job/logging.rb
diff options
context:
space:
mode:
authorAri Pollak <ajp@aripollak.com>2014-12-01 11:13:49 -0500
committerAri Pollak <ajp@aripollak.com>2014-12-01 11:16:30 -0500
commit25c8ea264ea4d690da00439d1414083750a52616 (patch)
tree774e13ab81988cb5da5b7f565205e4c752b738cf /activejob/lib/active_job/logging.rb
parent802630378e5ed7ffae500034bc926b8318524e43 (diff)
downloadrails-25c8ea264ea4d690da00439d1414083750a52616.tar.gz
rails-25c8ea264ea4d690da00439d1414083750a52616.tar.bz2
rails-25c8ea264ea4d690da00439d1414083750a52616.zip
Only filter GIDable objects; remove cosmetic changes
Diffstat (limited to 'activejob/lib/active_job/logging.rb')
-rw-r--r--activejob/lib/active_job/logging.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/activejob/lib/active_job/logging.rb b/activejob/lib/active_job/logging.rb
index 74c02e149a..010c26dda4 100644
--- a/activejob/lib/active_job/logging.rb
+++ b/activejob/lib/active_job/logging.rb
@@ -6,8 +6,6 @@ module ActiveJob
module Logging #:nodoc:
extend ActiveSupport::Concern
- FILTERED = '[FILTERED]'.freeze
-
included do
cattr_accessor(:logger) { ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) }
@@ -86,20 +84,20 @@ module ActiveJob
event.payload[:adapter].name.demodulize.remove('Adapter') + "(#{event.payload[:job].queue_name})"
end
- def global_id_or_filtered(argument)
+ def global_id_or_inspected(argument)
if argument.is_a?(GlobalID::Identification)
argument.to_global_id.to_s
else
- FILTERED
+ argument.inspect
end
end
def args_info(job)
if job.arguments.any?
' with arguments: ' +
- job.arguments.map { |arg| global_id_or_filtered(arg) }.join(', ')
+ job.arguments.map { |arg| global_id_or_inspected(arg) }.join(', ')
else
- ""
+ ''
end
end