fluent-plugin-input-opensearch 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54b8f74f2ddc4993a1d2324bcd8fec593e3958df7bd7d943db6b824e5b905300
-  data.tar.gz: ee5883d73b68960ccf5222aff8ac2d11d1a14d39a90c8c969f72931c8063316d
+  metadata.gz: e53b50d95a8e49c01de104ae0c924c709548459dab412cf6572909ecd78bb2b1
+  data.tar.gz: 8026dd10e4d041bc31aa597d11da187274db023205cffb8c7114523eb8c5f9ab
 SHA512:
-  metadata.gz: 7f98160ecf531574253f0eb31ff13c17ac17e7c59a50e6af93158a4b4ef8220f7af37ce5d065ba894b520a3dd16b374cba0df9464c0472738329d1ee67c26e42
-  data.tar.gz: 1bfed6d610e861f525ef3b0a36cde68e4bf6fb25c1e5c02c4bc96caaf8d300c2b59bafbf87ef3db7765079524b07e76e7e2c819ccb8da50a96069e02e5af987b
+  metadata.gz: 446ba0410ef0e3a2b1880bf3964b7ae6c942fc1967b29d3816ff8dc64e78d43c84afeda7d14cf9733b94190dfb13d20e60d58ff2031e18c0483498400ccf9256
+  data.tar.gz: 1c2731dd694fd05dd55ff90347232d7982b5d38e1060c2ccd4f96edd0e1ab6bcfae637b3f0a49472cf7a5dc5252db4a0e37f3be91cd387f72bfd3cb27c519ab3

data/fluent-plugin-opensearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-input-opensearch'
-  s.version       = '1.2.1'
+  s.version       = '1.2.3'
   s.authors       = ['imcotop']
   s.email         = ['imcotop@icloud.com']
   s.description   = %q{Opensearch output plugin for Fluent event collector}

data/lib/fluent/plugin/in_opensearch.rb

@@ -344,13 +344,16 @@ module Fluent::Plugin
         end
         @retry.step
         #Raise error if the retry limit has been reached
-        raise "Hit limit for retries. retry_times: #{@retry.steps}, error: #{error.message}" if @retry.limit?
+        if @retry.limit?
+          log.error("Hit limit for retries. retry_times: #{@retry.steps}, #{error.message}")
+          exit(1)
+        end
         #Retry if the limit hasn't been reached
         log.warn("failed to connect or search.", retry_times: @retry.steps, next_retry_time: @retry.next_time.round, error: error.message)
         sleep(@retry.next_time - Time.now)
       else
         unless @retry.nil?
-          log.debug("retry succeeded.")
+          log.info("retry succeeded.")
           @retry = nil
         end
       end
@@ -360,13 +363,12 @@ module Fluent::Plugin
       return run_slice if @num_slices <= 1
 
       log.warn("Large slice number is specified:(#{@num_slices}). Consider reducing num_slices") if @num_slices > 8
-
       @num_slices.times.map do |slice_id|
         thread_create(:"in_opensearch_thread_#{slice_id}") do
           run_slice(slice_id)
         end
       end
-    rescue Faraday::ConnectionFailed, OpenSearch::Transport::Transport::Error => error
+    rescue => error
       update_retry_state(error)
       retry
     end
@@ -377,7 +379,7 @@ module Fluent::Plugin
       result = client.search(@options.merge(:body => Yajl.dump(slice_query) ))
       es = Fluent::MultiEventStream.new
 
-      result["hits"]["hits"].each {|hit| process_events(hit, es)} unless result.nil?
+      result["hits"]["hits"].each {|hit| process_events(hit, es)}
       has_hits = result['hits']['hits'].any?
       scroll_id = result['_scroll_id']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-input-opensearch
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - imcotop