Removed curl from search notifications to prevent confusion

Andrew Kane
1 parent 19790c64
Showing 3 changed files with 14 additions and 12 deletions Show diff stats
CHANGELOG.md
lib/searchkick/logging.rb
lib/searchkick/query.rb
@@ -3,7 +3,7 @@
 - Added safety check for multiple `Model.reindex`
 - Added `deep_paging` option
 - Added request parameters to `curl` representation
-- Cleaned up search notifications
+- Removed curl from search notifications to prevent confusion
 ## 4.1.1 (2019-11-19)
@@ -7,8 +7,7 @@ module Searchkick
       name = searchkick_klass ? "#{searchkick_klass.name} Search" : "Search"
       event = {
         name: name,
-        query: params,
-        term: original_term
+        query: params
       }
       ActiveSupport::Notifications.instrument("search.searchkick", event) do
         super
@@ -134,7 +133,6 @@ 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,
-        terms: searches.map { |q| q.original_term }
       }
       ActiveSupport::Notifications.instrument("multi_search.searchkick", event) do
         super
@@ -164,10 +162,17 @@ module Searchkick
       payload = event.payload
       name = "#{payload[:name]} (#{event.duration.round(1)}ms)"
-      message = {}
-      message[:query] = payload[:term] || "[custom]"
-      debug "  #{color(name, YELLOW, true)}  #{message.to_json}"
+      index = payload[:query][:index].is_a?(Array) ? payload[:query][:index].join(",") : payload[:query][:index]
+      type = payload[:query][:type]
+      request_params = payload[:query].except(:index, :type, :body)
+
+      params = []
+      request_params.each do |k, v|
+        params << "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"
+      end
+
+      debug "  #{color(name, YELLOW, true)}  #{index}#{type ? "/#{type.map { |t| CGI.escape(t) }.join(',')}" : ''}/_search#{params.any? ? "?" + params.join('&') : nil} #{payload[:query][:body].to_json}"
     end
     def request(event)
@@ -186,10 +191,8 @@ module Searchkick
       payload = event.payload
       name = "#{payload[:name]} (#{event.duration.round(1)}ms)"
-      message = {}
-      message[:queries] = payload[:terms].map { |q| q || "[custom]" }
-      debug "  #{color(name, YELLOW, true)}  #{message.to_json}"
+      debug "  #{color(name, YELLOW, true)}  _msearch #{payload[:body]}"
     end
   end
@@ -4,7 +4,7 @@ module Searchkick
     @@metric_aggs = [:avg, :cardinality, :max, :min, :sum]
-    attr_reader :klass, :term, :options, :original_term
+    attr_reader :klass, :term, :options
     attr_accessor :body
     def_delegators :execute, :map, :each, :any?, :empty?, :size, :length, :slice, :[], :to_ary,
@@ -23,7 +23,6 @@ module Searchkick
       raise ArgumentError, "unknown keywords: #{unknown_keywords.join(", ")}" if unknown_keywords.any?
       term = term.to_s
-      @original_term = options[:body] ? nil : term
       if options[:emoji]
         term = EmojiParser.parse_unicode(term) { |e| " #{e.name} " }.strip
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	- Added safety check for multiple `Model.reindex`	3	- Added safety check for multiple `Model.reindex`
4	- Added `deep_paging` option	4	- Added `deep_paging` option
5	- Added request parameters to `curl` representation	5	- Added request parameters to `curl` representation
6	-- Cleaned up search notifications	6	+- Removed curl from search notifications to prevent confusion
7		7
8	## 4.1.1 (2019-11-19)	8	## 4.1.1 (2019-11-19)
9		9