Raise errors with full messages from Elasticsearch on bulk import failure.

audreyschwarz
1 parent ba2766c5
Showing 2 changed files with 23 additions and 2 deletions Show diff stats
lib/searchkick.rb
test/errors_test.rb
@@ -103,8 +103,12 @@ module Searchkick
     if items.any?
       response = client.bulk(body: items)
       if response["errors"]
-        first_item = response["items"].first
-        raise Searchkick::ImportError, (first_item["index"] || first_item["delete"])["error"]
+        messages = response["items"].map do |item|
+          (item["index"] || item["delete"])
+        end.select { |item| item["error"] }.map do |item|
+          "#{item["error"]} on item with id '#{item["_id"]}'"
+        end.join "\n"
+        raise Searchkick::ImportError, messages
       end
     end
   end
@@ -0,0 +1,17 @@
+require_relative "test_helper"
+
+class ErrorsTest < Minitest::Test
+  def test_bulk_import_raises_with_full_message
+    valid_dog = Dog.new(name: "2016-01-01")
+    invalid_dog_1 = Dog.new(name: "Bucket")
+    invalid_dog_2 = Dog.new(name: "Ol' One-Leg")
+    index = Searchkick::Index.new "dogs"
+    message = nil
+    begin
+      index.bulk_index [valid_dog, invalid_dog_1, invalid_dog_2]
+    rescue Searchkick::ImportError => e
+      message = e.message
+    end
+    assert_match /MapperParsingException.*Bucket.*Ol' One-Leg/m, message
+  end
+end
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+require_relative "test_helper"
	2	+
	3	+class ErrorsTest < Minitest::Test
	4	+ def test_bulk_import_raises_with_full_message
	5	+ valid_dog = Dog.new(name: "2016-01-01")
	6	+ invalid_dog_1 = Dog.new(name: "Bucket")
	7	+ invalid_dog_2 = Dog.new(name: "Ol' One-Leg")
	8	+ index = Searchkick::Index.new "dogs"
	9	+ message = nil
	10	+ begin
	11	+ index.bulk_index [valid_dog, invalid_dog_1, invalid_dog_2]
	12	+ rescue Searchkick::ImportError => e
	13	+ message = e.message
	14	+ end
	15	+ assert_match /MapperParsingException.Bucket.Ol' One-Leg/m, message
	16	+ end
	17	+end