make whitelist thread safe

flyerhzm · Feb 29, 2020 · 9cda9c2 · 9cda9c2
1 parent 656b225
commit 9cda9c2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/lib/bullet.rb b/lib/bullet.rb
@@ -38,7 +38,6 @@ class << self
                 :stacktrace_includes,
                 :stacktrace_excludes,
                 :skip_html_injection
-    attr_reader :whitelist
     attr_accessor :add_footer, :orm_patches_applied
 
     available_notifiers = UniformNotifier::AVAILABLE_NOTIFIERS.map { |notifier| "#{notifier}=" }
@@ -98,27 +97,27 @@ def stacktrace_excludes
 
     def add_whitelist(options)
       reset_whitelist
-      @whitelist[options[:type]][options[:class_name]] ||= []
-      @whitelist[options[:type]][options[:class_name]] << options[:association].to_sym
+      Thread.current[:whitelist][options[:type]][options[:class_name]] ||= []
+      Thread.current[:whitelist][options[:type]][options[:class_name]] << options[:association].to_sym
     end
 
     def delete_whitelist(options)
       reset_whitelist
-      @whitelist[options[:type]][options[:class_name]] ||= []
-      @whitelist[options[:type]][options[:class_name]].delete(options[:association].to_sym)
-      @whitelist[options[:type]].delete_if { |_key, val| val.empty? }
+      Thread.current[:whitelist][options[:type]][options[:class_name]] ||= []
+      Thread.current[:whitelist][options[:type]][options[:class_name]].delete(options[:association].to_sym)
+      Thread.current[:whitelist][options[:type]].delete_if { |_key, val| val.empty? }
     end
 
     def get_whitelist_associations(type, class_name)
-      Array(@whitelist[type][class_name])
+      Array(Thread.current[:whitelist][type][class_name])
     end
 
     def reset_whitelist
-      @whitelist ||= { n_plus_one_query: {}, unused_eager_loading: {}, counter_cache: {} }
+      Thread.current[:whitelist] ||= { n_plus_one_query: {}, unused_eager_loading: {}, counter_cache: {} }
     end
 
     def clear_whitelist
-      @whitelist = nil
+      Thread.current[:whitelist] = nil
     end
 
     def bullet_logger=(active)

diff --git a/spec/bullet_spec.rb b/spec/bullet_spec.rb
@@ -88,7 +88,7 @@
       it 'is deleted from the whitelist successfully' do
         Bullet.add_whitelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
         Bullet.delete_whitelist(type: :n_plus_one_query, class_name: 'Klass', association: :department)
-        expect(Bullet.whitelist[:n_plus_one_query]).to eq({})
+        expect(Thread.current[:whitelist][:n_plus_one_query]).to eq({})
       end
     end