Merge pull request rails#48107 from Mangara/mangara-fix-logging-queue-adapter-name

Improve queue adapter name extraction for logs

Author: byroot

activejob/lib/active_job/log_subscriber.rb

@@ -67,7 +67,8 @@ def enqueue_all(event)
           end
         else
           failed_enqueue_count = jobs.size - enqueued_count
-          "Failed enqueuing #{failed_enqueue_count} #{'job'.pluralize(failed_enqueue_count)} to #{adapter_name(adapter)}"
+          "Failed enqueuing #{failed_enqueue_count} #{'job'.pluralize(failed_enqueue_count)} "\
+            "to #{ActiveJob.adapter_name(adapter)}"
         end
       end
     end
@@ -137,11 +138,7 @@ def discard(event)
 
     private
       def queue_name(event)
-        adapter_name(event.payload[:adapter]) + "(#{event.payload[:job].queue_name})"
-      end
-
-      def adapter_name(adapter)
-        adapter.class.name.demodulize.delete_suffix("Adapter")
+        ActiveJob.adapter_name(event.payload[:adapter]) + "(#{event.payload[:job].queue_name})"
       end
 
       def args_info(job)
@@ -205,7 +202,7 @@ def extract_enqueue_source_location(locations)
       def enqueued_jobs_message(adapter, enqueued_jobs)
         enqueued_count = enqueued_jobs.size
         job_classes_counts = enqueued_jobs.map(&:class).tally.sort_by { |_k, v| -v }
-        "Enqueued #{enqueued_count} #{'job'.pluralize(enqueued_count)} to #{adapter_name(adapter)}"\
+        "Enqueued #{enqueued_count} #{'job'.pluralize(enqueued_count)} to #{ActiveJob.adapter_name(adapter)}"\
           " (#{job_classes_counts.map { |klass, count| "#{count} #{klass}" }.join(', ')})"
       end
   end

activejob/lib/active_job/queue_adapter.rb

@@ -3,6 +3,15 @@
 require "active_support/core_ext/string/inflections"
 
 module ActiveJob
+  class << self
+    def adapter_name(adapter) # :nodoc:
+      return adapter.queue_adapter_name if adapter.respond_to?(:queue_adapter_name)
+
+      adapter_class = adapter.is_a?(Module) ? adapter : adapter.class
+      "#{adapter_class.name.demodulize.delete_suffix('Adapter')}"
+    end
+  end
+
   # = Active Job Queue adapter
   #
   # The <tt>ActiveJob::QueueAdapter</tt> module is used to load the
@@ -43,7 +52,7 @@ def queue_adapter=(name_or_adapter)
           assign_adapter(name_or_adapter.to_s, queue_adapter)
         else
           if queue_adapter?(name_or_adapter)
-            adapter_name = extract_adapter_name(name_or_adapter)
+            adapter_name = ActiveJob.adapter_name(name_or_adapter).underscore
             assign_adapter(adapter_name, name_or_adapter)
           else
             raise ArgumentError
@@ -62,13 +71,6 @@ def assign_adapter(adapter_name, queue_adapter)
         def queue_adapter?(object)
           QUEUE_ADAPTER_METHODS.all? { |meth| object.respond_to?(meth) }
         end
-
-        def extract_adapter_name(adapter)
-          return adapter.queue_adapter_name if adapter.respond_to?(:queue_adapter_name)
-
-          adapter_class = adapter.is_a?(Module) ? adapter : adapter.class
-          "#{adapter_class.name.demodulize.remove('Adapter').underscore}"
-        end
     end
   end
 end