Collapse LogSubscriber into Logging

2 files changed, 26 insertions, 29 deletions

diff --git a/lib/active_job/log_subscriber.rb b/lib/active_job/log_subscriber.rb
deleted file mode 100644
index 5f0de902b5..0000000000
--- a/lib/active_job/log_subscriber.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'active_support/core_ext/string/filters'
-
-module ActiveJob
-  class LogSubscriber < ActiveSupport::LogSubscriber
-    def enqueue(event)
-      info "Enqueued #{event.payload[:job].name} to #{queue_name(event)}" + args_info(event)
-    end
-
-    def enqueue_at(event)
-      info "Enqueued #{event.payload[:job].name} to #{queue_name(event)} at #{event.payload[:timestamp]}" + args_info(event)
-    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
-
-ActiveJob::LogSubscriber.attach_to :active_job
diff --git a/lib/active_job/logging.rb b/lib/active_job/logging.rb
index 0e994a8f54..5e33e0da1f 100644
--- a/lib/active_job/logging.rb
+++ b/lib/active_job/logging.rb
@@ -1,7 +1,32 @@
-require 'active_job/log_subscriber'
+require 'active_support/core_ext/string/filters'
 
 module ActiveJob
   module Logging
     mattr_accessor(:logger) { ActiveSupport::Logger.new(STDOUT) }
+
+    class LogSubscriber < ActiveSupport::LogSubscriber
+      def enqueue(event)
+        info "Enqueued #{event.payload[:job].name} to #{queue_name(event)}" + args_info(event)
+      end
+
+      def enqueue_at(event)
+        info "Enqueued #{event.payload[:job].name} to #{queue_name(event)} at #{event.payload[:timestamp]}" + args_info(event)
+      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
 end
+
+ActiveJob::Logging::LogSubscriber.attach_to :active_job