From bd349b373acca0bd636abeb382213d71354eaf17 Mon Sep 17 00:00:00 2001
From: Navid EMAD <design.navid@gmail.com>
Date: Sun, 29 Sep 2024 00:58:30 +0200
Subject: [PATCH] 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
---
 .../subscription_adapter/solid_cable.rb       |   2 +-
 test/dummy/solid_cable_test-shm               | Bin 0 -> 32768 bytes
 test/dummy/solid_cable_test-wal               |   0
 .../subscription_adapter/solid_cable_test.rb  |  20 ++++++++++++++++++
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 test/dummy/solid_cable_test-shm
 create mode 100644 test/dummy/solid_cable_test-wal

diff --git a/lib/action_cable/subscription_adapter/solid_cable.rb b/lib/action_cable/subscription_adapter/solid_cable.rb
index bebc37c..401c273 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10
GIT binary patch
literal 32768
zcmeIuAr62r3<XeTSayS60=Z=O-0|kP2&fu@!6Du^ziFC^7w55MN)9hQYV3Wk79a2P
z)%8g3H30$y2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
w0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5cq?@4dk5`Qvd(}

literal 0
HcmV?d00001

diff --git a/test/dummy/solid_cable_test-wal b/test/dummy/solid_cable_test-wal
new file mode 100644
index 0000000..e69de29
diff --git a/test/lib/action_cable/subscription_adapter/solid_cable_test.rb b/test/lib/action_cable/subscription_adapter/solid_cable_test.rb
index c09e587..6dedad8 100644
--- 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