Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support nil logger #39

Merged
merged 6 commits into from
Sep 28, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/action_cable/subscription_adapter/solid_cable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def broadcast_messages
end

def with_polling_volume
navidemad marked this conversation as resolved.
Show resolved Hide resolved
if ::SolidCable.silence_polling?
if ::SolidCable.silence_polling? && ActiveRecord::Base.logger
navidemad marked this conversation as resolved.
Show resolved Hide resolved
ActiveRecord::Base.logger.silence { yield }
else
yield
Expand Down
29 changes: 22 additions & 7 deletions test/lib/action_cable/subscription_adapter/solid_cable_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ class ActionCable::SubscriptionAdapter::SolidCableTest < ActionCable::TestCase
WAIT_WHEN_NOT_EXPECTING_EVENT = 0.2

setup do
server = ActionCable::Server::Base.new
server.config.cable = cable_config.with_indifferent_access
server.config.logger = Logger.new(StringIO.new).tap do |l|
@server = ActionCable::Server::Base.new
@server.config.cable = cable_config.with_indifferent_access
@server.config.logger = Logger.new(StringIO.new).tap do |l|
l.level = Logger::UNKNOWN
end

adapter_klass = server.config.pubsub_adapter
adapter_klass = @server.config.pubsub_adapter

@rx_adapter = adapter_klass.new(server)
@tx_adapter = adapter_klass.new(server)
@rx_adapter = adapter_klass.new(@server)
@tx_adapter = adapter_klass.new(@server)
navidemad marked this conversation as resolved.
Show resolved Hide resolved

@tx_adapter.shutdown
@tx_adapter = @rx_adapter
Expand Down Expand Up @@ -136,10 +136,18 @@ class ActionCable::SubscriptionAdapter::SolidCableTest < ActionCable::TestCase
end
end

test "silencing polling queries when there's no Active Record logger" do
navidemad marked this conversation as resolved.
Show resolved Hide resolved
with_active_record_logger(nil) do
@rx_adapter.send(:listener).send(:broadcast_messages)
end

assert true
Copy link
Contributor Author

@navidemad navidemad Sep 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No logger, nothing to check, just ensure it runs without errors

end

private
def cable_config
{ adapter: "solid_cable", message_retention: "1.second",
polling_interval: "0.01.seconds" }
polling_interval: "0.01.seconds", silence_polling: true }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the default value, but needed to add it there for my mocking method with_active_record_logger

navidemad marked this conversation as resolved.
Show resolved Hide resolved
end

def subscribe_as_queue(channel, adapter = @rx_adapter)
Expand All @@ -159,4 +167,11 @@ 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, @server.config.logger = @server.config.logger, logger
navidemad marked this conversation as resolved.
Show resolved Hide resolved
yield
ensure
@server.config.logger = old_logger
end
end
Loading