Fixed notification messages [skip ci]

Andrew Kane
1 parent 16e61e17
Showing 2 changed files with 6 additions and 3 deletions Show diff stats
lib/searchkick.rb
lib/searchkick/bulk_indexer.rb
@@ -200,7 +200,8 @@ module Searchkick
     end
   end
  
-  def self.callbacks(value = nil)
+  # message is private
+  def self.callbacks(value = nil, message: "Bulk")
     if block_given?
       previous_value = callbacks_value
       begin
@@ -208,7 +209,7 @@ module Searchkick
         result = yield
         if callbacks_value == :bulk
           event = {
-            name: "Bulk",
+            name: message,
             count: indexer.queued_items.size
           }
           ActiveSupport::Notifications.instrument("request.searchkick", event) do
@@ -106,8 +106,10 @@ module Searchkick
  
     # import in single request with retries
     def import_inline(index_records, delete_records, method_name:)
+      action = method_name ? "Update" : "Import"
+      name = (index_records.first || delete_records.first).searchkick_klass.name
       with_retries do
-        Searchkick.callbacks(:bulk) do
+        Searchkick.callbacks(:bulk, message: "#{name} #{action}") do
           if index_records.any?
             if method_name
               index.bulk_update(index_records, method_name)
...	...	@@ -200,7 +200,8 @@ module Searchkick
200	200	end
201	201	end
202	202
203		- def self.callbacks(value = nil)
	203	+ # message is private
	204	+ def self.callbacks(value = nil, message: "Bulk")
204	205	if block_given?
205	206	previous_value = callbacks_value
206	207	begin
...	...	@@ -208,7 +209,7 @@ module Searchkick
208	209	result = yield
209	210	if callbacks_value == :bulk
210	211	event = {
211		- name: "Bulk",
	212	+ name: message,
212	213	count: indexer.queued_items.size
213	214	}
214	215	ActiveSupport::Notifications.instrument("request.searchkick", event) do
...	...
...	...	@@ -106,8 +106,10 @@ module Searchkick
106	106
107	107	# import in single request with retries
108	108	def import_inline(index_records, delete_records, method_name:)
	109	+ action = method_name ? "Update" : "Import"
	110	+ name = (index_records.first \|\| delete_records.first).searchkick_klass.name
109	111	with_retries do
110		- Searchkick.callbacks(:bulk) do
	112	+ Searchkick.callbacks(:bulk, message: "#{name} #{action}") do
111	113	if index_records.any?
112	114	if method_name
113	115	index.bulk_update(index_records, method_name)
...	...