From 373c38a6f757eff6239fda8de5a037831510ddf0 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 20 May 2014 19:08:06 +0200
Subject: DRY up the two event loggings

---
 lib/active_job/log_subscriber.rb | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'lib/active_job')

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
 
-- 
cgit v1.2.3