Better logging for custom queries

Andrew Kane
1 parent 305fea39
Showing 1 changed file with 3 additions and 3 deletions Show diff stats
lib/searchkick/logging.rb
@@ -134,7 +134,7 @@ module Searchkick
       event = {
         name: "Multi Search",
         body: searches.flat_map { |q| [q.params.except(:body).to_json, q.body.to_json] }.map { |v| "#{v}\n" }.join,
-        term: searches.first.term
+        terms: searches.map { |q| q.options[:body] ? nil : q.term }
       }
       ActiveSupport::Notifications.instrument("multi_search.searchkick", event) do
         super
@@ -165,7 +165,7 @@ module Searchkick
       payload = event.payload
       name = "#{payload[:name]} (#{event.duration.round(1)}ms)"
       message = {}
-      message[:query] = payload[:term] if payload[:term]
+      message[:query] = payload[:term] || "[custom]"
       debug "  #{color(name, YELLOW, true)}  #{message.to_json}"
     end
@@ -187,7 +187,7 @@ module Searchkick
       payload = event.payload
       name = "#{payload[:name]} (#{event.duration.round(1)}ms)"
       message = {}
-      message[:query] = payload[:term] if payload[:term]
+      message[:queries] = payload[:terms].map { |q| q || "[custom]" }
       debug "  #{color(name, YELLOW, true)}  #{message.to_json}"
     end
	@@ -134,7 +134,7 @@ module Searchkick		@@ -134,7 +134,7 @@ module Searchkick
134	event = {	134	event = {
135	name: "Multi Search",	135	name: "Multi Search",
136	body: searches.flat_map { \|q\| [q.params.except(:body).to_json, q.body.to_json] }.map { \|v\| "#{v}\n" }.join,	136	body: searches.flat_map { \|q\| [q.params.except(:body).to_json, q.body.to_json] }.map { \|v\| "#{v}\n" }.join,
137	- term: searches.first.term	137	+ terms: searches.map { \|q\| q.options[:body] ? nil : q.term }
138	}	138	}
139	ActiveSupport::Notifications.instrument("multi_search.searchkick", event) do	139	ActiveSupport::Notifications.instrument("multi_search.searchkick", event) do
140	super	140	super
	@@ -165,7 +165,7 @@ module Searchkick		@@ -165,7 +165,7 @@ module Searchkick
165	payload = event.payload	165	payload = event.payload
166	name = "#{payload[:name]} (#{event.duration.round(1)}ms)"	166	name = "#{payload[:name]} (#{event.duration.round(1)}ms)"
167	message = {}	167	message = {}
168	- message[:query] = payload[:term] if payload[:term]	168	+ message[:query] = payload[:term] \|\| "[custom]"
169		169
170	debug " #{color(name, YELLOW, true)} #{message.to_json}"	170	debug " #{color(name, YELLOW, true)} #{message.to_json}"
171	end	171	end
	@@ -187,7 +187,7 @@ module Searchkick		@@ -187,7 +187,7 @@ module Searchkick
187	payload = event.payload	187	payload = event.payload
188	name = "#{payload[:name]} (#{event.duration.round(1)}ms)"	188	name = "#{payload[:name]} (#{event.duration.round(1)}ms)"
189	message = {}	189	message = {}
190	- message[:query] = payload[:term] if payload[:term]	190	+ message[:queries] = payload[:terms].map { \|q\| q \|\| "[custom]" }
191		191
192	debug " #{color(name, YELLOW, true)} #{message.to_json}"	192	debug " #{color(name, YELLOW, true)} #{message.to_json}"
193	end	193	end