Support nil ActiveRecord logger (#39)

* Support nil logger * Fix silence for older rails version * Fixes PR reviews * Simplify with_polling_volume method * Fixes PR reviews * Fixes PR reviews
rails · Sep 28, 2024 · bd349b3 · bd349b3
1 parent a4d0c56
commit bd349b3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/lib/action_cable/subscription_adapter/solid_cable.rb b/lib/action_cable/subscription_adapter/solid_cable.rb
@@ -104,7 +104,7 @@ def broadcast_messages
             end
 
             def with_polling_volume
-              if ::SolidCable.silence_polling?
+              if ::SolidCable.silence_polling? && ActiveRecord::Base.logger
                 ActiveRecord::Base.logger.silence { yield }
               else
                 yield

diff --git a/test/dummy/solid_cable_test-shm b/test/dummy/solid_cable_test-shm
diff --git a/test/dummy/solid_cable_test-wal b/test/dummy/solid_cable_test-wal
diff --git a/test/lib/action_cable/subscription_adapter/solid_cable_test.rb b/test/lib/action_cable/subscription_adapter/solid_cable_test.rb
@@ -136,6 +136,18 @@ class ActionCable::SubscriptionAdapter::SolidCableTest < ActionCable::TestCase
     end
   end
 
+  test "does not raise error when polling with no Active Record logger" do
+    with_active_record_logger(nil) do
+      assert_nothing_raised do
+        subscribe_as_queue("channel") do |queue|
+          @tx_adapter.broadcast("channel", "hello world")
+
+          assert_equal "hello world", queue.pop
+        end
+      end
+    end
+  end
+
   private
     def cable_config
       { adapter: "solid_cable", message_retention: "1.second",
@@ -159,4 +171,12 @@ def subscribe_as_queue(channel, adapter = @rx_adapter)
     ensure
       adapter.unsubscribe(channel, callback) if subscribed.set?
     end
+
+    def with_active_record_logger(logger)
+      old_logger = ActiveRecord::Base.logger
+      ActiveRecord::Base.logger = logger
+      yield
+    ensure
+      ActiveRecord::Base.logger = old_logger
+    end
 end