Skip to content
Merged
Changes from all commits
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
12 changes: 10 additions & 2 deletions lib/rails_semantic_logger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def self.swap_subscriber(old_class, new_class, notifier)

def self.unattach(subscriber)
subscriber_patterns(subscriber).each do |pattern|
ActiveSupport::Notifications.notifier.listeners_for(pattern).each do |sub|
listeners_for(ActiveSupport::Notifications.notifier, pattern).each do |sub|
next unless sub.instance_variable_get(:@delegate) == subscriber

ActiveSupport::Notifications.unsubscribe(sub)
Expand All @@ -67,7 +67,15 @@ def self.subscriber_patterns(subscriber)
end
end

private_class_method :subscriber_patterns, :unattach
def self.listeners_for(notifier, pattern)
if notifier.respond_to?(:all_listeners_for) # Rails >= 7.1
notifier.all_listeners_for(pattern)
else
notifier.listeners_for(pattern)
end
end

private_class_method :listeners_for, :subscriber_patterns, :unattach
end

require("rails_semantic_logger/extensions/mongoid/config") if defined?(Mongoid)
Expand Down