Rename silence_queries to silence_sql_logs

The setting silences all SQL statements (SELECT, INSERT, UPDATE, etc.),
not just queries. silence_sql_logs is more accurate.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: rosa

README.md

@@ -366,7 +366,7 @@ All the options available to Active Record for multiple databases can be used he
 
 ### Other configuration settings
 
-_Note_: The settings in this section should be set in your `config/application.rb` or your environment config like this: `config.solid_queue.silence_queries = true`
+_Note_: The settings in this section should be set in your `config/application.rb` or your environment config like this: `config.solid_queue.silence_sql_logs = true`
 
 There are several settings that control how Solid Queue works that you can set as well:
 - `logger`: the logger you want Solid Queue to use. Defaults to the app logger.
@@ -383,7 +383,7 @@ There are several settings that control how Solid Queue works that you can set a
 - `process_heartbeat_interval`: the heartbeat interval that all processes will follow—defaults to 60 seconds.
 - `process_alive_threshold`: how long to wait until a process is considered dead after its last heartbeat—defaults to 5 minutes.
 - `shutdown_timeout`: time the supervisor will wait since it sent the `TERM` signal to its supervised processes before sending a `QUIT` version to them requesting immediate termination—defaults to 5 seconds.
-- `silence_queries`: whether to silence Active Record logs emitted by Solid Queue's internal queries (polling, heartbeats, maintenance, etc.)—defaults to `true`. Queries from job execution are not silenced.
+- `silence_sql_logs`: whether to silence Active Record SQL logs emitted by Solid Queue's internal operations (polling, heartbeats, maintenance, enqueuing, etc.)—defaults to `true`. SQL from job execution is not silenced.
 - `supervisor_pidfile`: path to a pidfile that the supervisor will create when booting to prevent running more than one supervisor in the same host, or in case you want to use it for a health check. It's `nil` by default.
 - `preserve_finished_jobs`: whether to keep finished jobs in the `solid_queue_jobs` table—defaults to `true`.
 - `clear_finished_jobs_after`: period to keep finished jobs around, in case `preserve_finished_jobs` is true — defaults to 1 day. When installing Solid Queue, [a recurring job](#recurring-tasks) is automatically configured to clear finished jobs every hour on the 12th minute in batches. You can edit the `recurring.yml` configuration to change this as you see fit.

app/models/solid_queue/claimed_execution.rb

@@ -89,14 +89,16 @@ def discard
   end
 
   def failed_with(error)
-    transaction do
-      job.failed_with(error)
-      destroy!
+    silencing_sql_logs do
+      transaction do
+        job.failed_with(error)
+        destroy!
+      end
     end
   end
 
   def unblock_next_job
-    job.unblock_next_blocked_job
+    silencing_sql_logs { job.unblock_next_blocked_job }
   end
 
   private
@@ -108,9 +110,11 @@ def execute
     end
 
     def finished
-      transaction do
-        job.finished!
-        destroy!
+      silencing_sql_logs do
+        transaction do
+          job.finished!
+          destroy!
+        end
       end
     end
 end

app/models/solid_queue/job.rb

@@ -13,12 +13,14 @@ def enqueue_all(active_jobs)
         active_jobs.each { |job| job.scheduled_at ||= Time.current }
         active_jobs_by_job_id = active_jobs.index_by(&:job_id)
 
-        transaction do
-          jobs = create_all_from_active_jobs(active_jobs)
-          prepare_all_for_execution(jobs).tap do |enqueued_jobs|
-            enqueued_jobs.each do |enqueued_job|
-              active_jobs_by_job_id[enqueued_job.active_job_id].provider_job_id = enqueued_job.id
-              active_jobs_by_job_id[enqueued_job.active_job_id].successfully_enqueued = true
+        silencing_sql_logs do
+          transaction do
+            jobs = create_all_from_active_jobs(active_jobs)
+            prepare_all_for_execution(jobs).tap do |enqueued_jobs|
+              enqueued_jobs.each do |enqueued_job|
+                active_jobs_by_job_id[enqueued_job.active_job_id].provider_job_id = enqueued_job.id
+                active_jobs_by_job_id[enqueued_job.active_job_id].successfully_enqueued = true
+              end
             end
           end
         end
@@ -29,9 +31,11 @@ def enqueue_all(active_jobs)
       def enqueue(active_job, scheduled_at: Time.current)
         active_job.scheduled_at = scheduled_at
 
-        create_from_active_job(active_job).tap do |enqueued_job|
-          active_job.provider_job_id = enqueued_job.id if enqueued_job.persisted?
-          active_job.successfully_enqueued = enqueued_job.persisted?
+        silencing_sql_logs do
+          create_from_active_job(active_job).tap do |enqueued_job|
+            active_job.provider_job_id = enqueued_job.id if enqueued_job.persisted?
+            active_job.successfully_enqueued = enqueued_job.persisted?
+          end
         end
       end
 

app/models/solid_queue/process/executor.rb

@@ -13,13 +13,13 @@ module Executor
 
       def fail_all_claimed_executions_with(error)
         if claims_executions?
-          claimed_executions.fail_all_with(error)
+          silencing_sql_logs { claimed_executions.fail_all_with(error) }
         end
       end
 
       def release_all_claimed_executions
         if claims_executions?
-          claimed_executions.release_all
+          silencing_sql_logs { claimed_executions.release_all }
         end
       end
 

app/models/solid_queue/record.rb

@@ -27,6 +27,14 @@ def supports_insert_conflict_target?
       def use_index(*indexes)
         optimizer_hints "INDEX(#{quoted_table_name} #{indexes.join(', ')})"
       end
+
+      def silencing_sql_logs(&block)
+        SolidQueue.silencing_sql_logs(&block)
+      end
+    end
+
+    def silencing_sql_logs(&block)
+      self.class.silencing_sql_logs(&block)
     end
   end
 end

lib/active_job/queue_adapters/solid_queue_adapter.rb

@@ -16,25 +16,16 @@ def enqueue_after_transaction_commit?
       end
 
       def enqueue(active_job) # :nodoc:
-        silence_queries { SolidQueue::Job.enqueue(active_job) }
+        SolidQueue::Job.enqueue(active_job)
       end
 
       def enqueue_at(active_job, timestamp) # :nodoc:
-        silence_queries { SolidQueue::Job.enqueue(active_job, scheduled_at: Time.at(timestamp)) }
+        SolidQueue::Job.enqueue(active_job, scheduled_at: Time.at(timestamp))
       end
 
       def enqueue_all(active_jobs) # :nodoc:
-        silence_queries { SolidQueue::Job.enqueue_all(active_jobs) }
+        SolidQueue::Job.enqueue_all(active_jobs)
       end
-
-      private
-        def silence_queries(&block)
-          if SolidQueue.silence_queries? && ActiveRecord::Base.logger
-            ActiveRecord::Base.logger.silence(&block)
-          else
-            yield
-          end
-        end
     end
   end
 end

lib/solid_queue.rb

@@ -32,7 +32,7 @@ module SolidQueue
 
   mattr_accessor :shutdown_timeout, default: 5.seconds
 
-  mattr_accessor :silence_queries, default: true
+  mattr_accessor :silence_sql_logs, default: true
 
   mattr_accessor :supervisor_pidfile
   mattr_accessor :supervisor, default: false
@@ -61,23 +61,31 @@ def supervisor?
     supervisor
   end
 
-  def silence_queries?
-    silence_queries
+  def silencing_sql_logs(&block)
+    if silence_sql_logs? && ActiveRecord::Base.logger
+      ActiveRecord::Base.logger.silence(&block)
+    else
+      yield
+    end
+  end
+
+  def silence_sql_logs?
+    silence_sql_logs
   end
 
   def silence_polling=(value)
-    SolidQueue.deprecator.warn("use silence_queries instead of silence_polling")
-    self.silence_queries = value
+    SolidQueue.deprecator.warn("use silence_sql_logs instead of silence_polling")
+    self.silence_sql_logs = value
   end
 
   def silence_polling
-    SolidQueue.deprecator.warn("use silence_queries instead of silence_polling")
-    silence_queries
+    SolidQueue.deprecator.warn("use silence_sql_logs instead of silence_polling")
+    silence_sql_logs
   end
 
   def silence_polling?
-    SolidQueue.deprecator.warn("use silence_queries? instead of silence_polling?")
-    silence_queries?
+    SolidQueue.deprecator.warn("use silence_sql_logs? instead of silence_polling?")
+    silence_sql_logs?
   end
 
   def preserve_finished_jobs?

lib/solid_queue/app_executor.rb

@@ -2,12 +2,7 @@
 
 module SolidQueue
   module AppExecutor
-    def wrap_in_app_executor(silence: true, &block)
-      if silence && SolidQueue.silence_queries? && ActiveRecord::Base.logger
-        original = block
-        block = proc { ActiveRecord::Base.logger.silence(&original) }
-      end
-
+    def wrap_in_app_executor(&block)
       if SolidQueue.app_executor
         SolidQueue.app_executor.wrap(source: "application.solid_queue", &block)
       else
@@ -32,5 +27,9 @@ def create_thread(&block)
         raise
       end
     end
+
+    def silencing_sql_logs(&block)
+      SolidQueue.silencing_sql_logs(&block)
+    end
   end
 end

lib/solid_queue/dispatcher.rb

@@ -37,7 +37,9 @@ def poll
 
       def dispatch_next_batch
         SolidQueue.instrument(:polling) do
-          ScheduledExecution.dispatch_next_batch(batch_size)
+          silencing_sql_logs do
+            ScheduledExecution.dispatch_next_batch(batch_size)
+          end
         end
       end
 
@@ -50,7 +52,9 @@ def stop_concurrency_maintenance
       end
 
       def all_work_completed?
-        SolidQueue::ScheduledExecution.none?
+        silencing_sql_logs do
+          SolidQueue::ScheduledExecution.none?
+        end
       end
 
       def set_procline

lib/solid_queue/dispatcher/concurrency_maintenance.rb

@@ -13,8 +13,12 @@ def initialize(interval, batch_size)
 
     def start
       @concurrency_maintenance_task = Concurrent::TimerTask.new(run_now: true, execution_interval: interval) do
-        expire_semaphores
-        unblock_blocked_executions
+        wrap_in_app_executor do
+          silencing_sql_logs do
+            expire_semaphores
+            unblock_blocked_executions
+          end
+        end
       end
 
       @concurrency_maintenance_task.add_observer do |_, _, error|
@@ -30,15 +34,11 @@ def stop
 
     private
       def expire_semaphores
-        wrap_in_app_executor do
-          Semaphore.expired.in_batches(of: batch_size, &:delete_all)
-        end
+        Semaphore.expired.in_batches(of: batch_size, &:delete_all)
       end
 
       def unblock_blocked_executions
-        wrap_in_app_executor do
-          BlockedExecution.unblock(batch_size)
-        end
+        BlockedExecution.unblock(batch_size)
       end
   end
 end