fluent-plugin-input-opensearch 1.2.1 → 1.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/fluent-plugin-opensearch.gemspec +1 -1
- data/lib/fluent/plugin/in_opensearch.rb +7 -5
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e53b50d95a8e49c01de104ae0c924c709548459dab412cf6572909ecd78bb2b1
|
|
4
|
+
data.tar.gz: 8026dd10e4d041bc31aa597d11da187274db023205cffb8c7114523eb8c5f9ab
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 446ba0410ef0e3a2b1880bf3964b7ae6c942fc1967b29d3816ff8dc64e78d43c84afeda7d14cf9733b94190dfb13d20e60d58ff2031e18c0483498400ccf9256
|
|
7
|
+
data.tar.gz: 1c2731dd694fd05dd55ff90347232d7982b5d38e1060c2ccd4f96edd0e1ab6bcfae637b3f0a49472cf7a5dc5252db4a0e37f3be91cd387f72bfd3cb27c519ab3
|
|
@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
|
|
|
3
3
|
|
|
4
4
|
Gem::Specification.new do |s|
|
|
5
5
|
s.name = 'fluent-plugin-input-opensearch'
|
|
6
|
-
s.version = '1.2.
|
|
6
|
+
s.version = '1.2.3'
|
|
7
7
|
s.authors = ['imcotop']
|
|
8
8
|
s.email = ['imcotop@icloud.com']
|
|
9
9
|
s.description = %q{Opensearch output plugin for Fluent event collector}
|
|
@@ -344,13 +344,16 @@ module Fluent::Plugin
|
|
|
344
344
|
end
|
|
345
345
|
@retry.step
|
|
346
346
|
#Raise error if the retry limit has been reached
|
|
347
|
-
|
|
347
|
+
if @retry.limit?
|
|
348
|
+
log.error("Hit limit for retries. retry_times: #{@retry.steps}, #{error.message}")
|
|
349
|
+
exit(1)
|
|
350
|
+
end
|
|
348
351
|
#Retry if the limit hasn't been reached
|
|
349
352
|
log.warn("failed to connect or search.", retry_times: @retry.steps, next_retry_time: @retry.next_time.round, error: error.message)
|
|
350
353
|
sleep(@retry.next_time - Time.now)
|
|
351
354
|
else
|
|
352
355
|
unless @retry.nil?
|
|
353
|
-
log.
|
|
356
|
+
log.info("retry succeeded.")
|
|
354
357
|
@retry = nil
|
|
355
358
|
end
|
|
356
359
|
end
|
|
@@ -360,13 +363,12 @@ module Fluent::Plugin
|
|
|
360
363
|
return run_slice if @num_slices <= 1
|
|
361
364
|
|
|
362
365
|
log.warn("Large slice number is specified:(#{@num_slices}). Consider reducing num_slices") if @num_slices > 8
|
|
363
|
-
|
|
364
366
|
@num_slices.times.map do |slice_id|
|
|
365
367
|
thread_create(:"in_opensearch_thread_#{slice_id}") do
|
|
366
368
|
run_slice(slice_id)
|
|
367
369
|
end
|
|
368
370
|
end
|
|
369
|
-
rescue
|
|
371
|
+
rescue => error
|
|
370
372
|
update_retry_state(error)
|
|
371
373
|
retry
|
|
372
374
|
end
|
|
@@ -377,7 +379,7 @@ module Fluent::Plugin
|
|
|
377
379
|
result = client.search(@options.merge(:body => Yajl.dump(slice_query) ))
|
|
378
380
|
es = Fluent::MultiEventStream.new
|
|
379
381
|
|
|
380
|
-
result["hits"]["hits"].each {|hit| process_events(hit, es)}
|
|
382
|
+
result["hits"]["hits"].each {|hit| process_events(hit, es)}
|
|
381
383
|
has_hits = result['hits']['hits'].any?
|
|
382
384
|
scroll_id = result['_scroll_id']
|
|
383
385
|
|