aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2014-05-20 19:08:06 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2014-05-20 19:08:06 +0200
commit373c38a6f757eff6239fda8de5a037831510ddf0 (patch)
treebaf5a96b54b3f6a650dd9d1c823d8d131f40f421 /lib
parentfbda318940c4cc7338808d84dbe969611be50ace (diff)
downloadrails-373c38a6f757eff6239fda8de5a037831510ddf0.tar.gz
rails-373c38a6f757eff6239fda8de5a037831510ddf0.tar.bz2
rails-373c38a6f757eff6239fda8de5a037831510ddf0.zip
DRY up the two event loggings
Diffstat (limited to 'lib')
-rw-r--r--lib/active_job/log_subscriber.rb28
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/active_job/log_subscriber.rb b/lib/active_job/log_subscriber.rb
index eae6c30745..5f0de902b5 100644
--- a/lib/active_job/log_subscriber.rb
+++ b/lib/active_job/log_subscriber.rb
@@ -3,25 +3,25 @@ require 'active_support/core_ext/string/filters'
module ActiveJob
class LogSubscriber < ActiveSupport::LogSubscriber
def enqueue(event)
- queue_name = event.payload[:adapter].name.demodulize.remove('Adapter')
- job_name = event.payload[:job].name
- args = event.payload[:args].any? ? ": #{event.payload[:args].inspect}" : ""
-
- info "Enqueued #{job_name} to #{queue_name}" + args
+ info "Enqueued #{event.payload[:job].name} to #{queue_name(event)}" + args_info(event)
end
def enqueue_at(event)
- queue_name = event.payload[:adapter].name.demodulize.remove('Adapter')
- job_name = event.payload[:job].name
- args = event.payload[:args].any? ? ": #{event.payload[:args].inspect}" : ""
- time = event.payload[:timestamp]
-
- info "Enqueued #{job_name} to #{queue_name} at #{time}" + args
+ info "Enqueued #{event.payload[:job].name} to #{queue_name(event)} at #{event.payload[:timestamp]}" + args_info(event)
end
- def logger
- ActiveJob::Base.logger
- end
+ private
+ def queue_name(event)
+ event.payload[:adapter].name.demodulize.remove('Adapter')
+ end
+
+ def args_info(event)
+ event.payload[:args].any? ? ": #{event.payload[:args].inspect}" : ""
+ end
+
+ def logger
+ ActiveJob::Base.logger
+ end
end
end