lib/embulk/input/elasticsearch/connection.rb in embulk-input-elasticsearch-nosslverify-0.3.7 vs lib/embulk/input/elasticsearch/connection.rb in embulk-input-elasticsearch-nosslverify-0.3.8

- old
+ new

@@ -1,8 +1,9 @@ require 'excon' require 'elasticsearch' + module Embulk module Input class Elasticsearch < InputPlugin class Connection def initialize(task) @@ -66,14 +67,16 @@ def search_with_retry retries = 0 begin yield if block_given? - rescue Faraday::ResourceNotFound => e + rescue ::Elasticsearch::Transport::Transport::Errors::NotFound => e if (@ignore_not_found) return - - end + end + msg = "Elasticsearch index not found #{e.message}" + raise Elasticsearch::ConnectionError.new e, msg + rescue => e if (@retry_on_failure == 0 || retries < @retry_on_failure) retries += 1 Embulk.logger.warn "Could not search to Elasticsearch, resetting connection and trying again. #{e.message}" sleep 2**retries