logstash-input-rds 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 375e1a8b9febeda8d5890d9880b80becb321c614824791cf41ac894ca3747ddd
-  data.tar.gz: 15da4d524aab4e325dbadd866bbb10fb3acadb8ac39b354dfeff34575d433a78
+  metadata.gz: 958deb69bbe779fc6b748ef63f9c42360c77f55d81709fac046b2e00dd9f0f21
+  data.tar.gz: 528f742f2497c526ad31d7eb804c6bdf8ce6b3185e56d1fde00dc8845ba1dacd
 SHA512:
-  metadata.gz: a55b75fe4e7c56485e87b4f83b94bbb83e23a9ad0e2e7b4425c91278f1a50ad755f51ac0397486c966f160cc967a6c7f38ff266a8eaa9af2a7002b422832a1fa
-  data.tar.gz: b20b154069aa93fb27e90e55dbdd5dd3a7fb6553740aac3427bef316b24ed4a4af496d5f0cc3c89fdbe6008a1191f7c46519b41b00c3cba965942710090fc5bb
+  metadata.gz: 6759bdbcda7bed425b90ff6e847c35cb297632b4026b83d02699d7f2e544b8ff7c7e1b667795bb8b2e4a868ad4f0d238c6b4db416cff1ec9eddd8bee293c4adb
+  data.tar.gz: 59f8abae36b0805e1222114332ac18f0bbe340e43f98fa00ce18a7dff967ae3a78dfea7f7a88adf37994fd4d294ef2d26d46748cf6ca76401a877582205e28d0

data/lib/logstash/inputs/rds.rb

@@ -33,28 +33,33 @@ class LogStash::Inputs::Rds < LogStash::Inputs::Base
     @thread = Thread.current
     Stud.interval(@polling_frequency) do
       @logger.debug "finding #{@log_file_name} for #{@instance_name} starting #{@sincedb.read} (#{@sincedb.read.to_i * 1000})"
-      logfiles = @database.log_files({
-        filename_contains: @log_file_name,
-        file_last_written: @sincedb.read.to_i * 1000,
-      })
-      logfiles.each do |logfile|
-        @logger.debug "downloading #{logfile.name} for #{@instance_name}"
-        more = true
-        marker = "0"
-        while more do
-          response = logfile.download({marker: marker})
-          response[:log_file_data].lines.each do |line|
-            @codec.decode(line) do |event|
-              decorate event
-              event.set "rds_instance", @instance_name
-              event.set "log_file", @log_file_name
-              queue << event
+      begin
+        logfiles = @database.log_files({
+          filename_contains: @log_file_name,
+          file_last_written: @sincedb.read.to_i * 1000,
+        })
+        logfiles.each do |logfile|
+          @logger.debug "downloading #{logfile.name} for #{@instance_name}"
+          more = true
+          marker = "0"
+          while more do
+            response = logfile.download({marker: marker})
+            response[:log_file_data].lines.each do |line|
+              @codec.decode(line) do |event|
+                decorate event
+                event.set "rds_instance", @instance_name
+                event.set "log_file", @log_file_name
+                queue << event
+              end
             end
+            more = response[:additional_data_pending]
+            marker = response[:marker]
           end
-          more = response[:additional_data_pending]
-          marker = response[:marker]
+          @sincedb.write (filename2datetime logfile.name)
         end
-        @sincedb.write (filename2datetime logfile.name)
+      rescue Aws::RDS::Errors::ServiceError
+        # the next iteration will resume at the same location
+        @logger.warn "caught AWS service error"
       end
     end
   end

data/logstash-input-rds.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-input-rds'
-  s.version       = '0.16.0'
+  s.version       = '0.17.0'
   s.summary       = 'Ingest RDS log files to Logstash'
 
   s.authors       = ['Andrew Schleifer']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-rds
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Andrew Schleifer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement