logstash-input-s3 3.3.4 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c14073f2906b9c1958697f2fac9d9c94f63451194494cb6c2b7152d7884fbf5e
-  data.tar.gz: fd650fb97f1624cb0586c47be4c12d5cfd6742135499474854d2f3f05526ee84
+  metadata.gz: a7604e6bdb9c402c5b0a66e838ba0b124b7fa5e4e1a482d9f32a6c7efb9efbd5
+  data.tar.gz: 0ce9f4cb73567cf637da17169c67698dc113682261f6238c4eee3a020a4063ff
 SHA512:
-  metadata.gz: 2dbb14ca04cebda808918a9cd2fec7a1fda0c5d41cb39ba30d86e83e3c62e9eb9ed77dd6e24ff77c5e8cdb2338061bf503ea1bad9dddeaffc65694258548d0eb
-  data.tar.gz: b0f938a69ba7968a7dacfba808eb8d4e983c6c2f01990a324e170579574789b3504db2cc670cfe2c290f3417eea3abbc03331bf5b071f697c1efdf3c4db86eb7
+  metadata.gz: e91c6d2dccb6733f91d76edb5a763e42bcb5bc14a42f6d729e115e89ff4f785f23644980c8239725f2f593ee1f72969ff0d02f0143a242788e359374a6a987a4
+  data.tar.gz: 8f2d477a65b46bb5f29c1635f1e82f36d554e3d5773a487de68343f58656d26a9e474cff44f59df48071dad2445469b86b81b55ee374b1781bdda844e06119a7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.3.5
+  - [#136](https://github.com/logstash-plugins/logstash-input-s3/pull/136) Avoid plugin crashes when encountering 'bad' files in S3 buckets
+
 ## 3.3.4
   - Log entry when bucket is empty #150
 

data/lib/logstash/inputs/s3.rb

@@ -255,11 +255,14 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
 
   private
   def read_file(filename, &block)
-    if gzip?(filename) 
+    if gzip?(filename)
       read_gzip_file(filename, block)
     else
       read_plain_file(filename, block)
     end
+  rescue => e
+    # skip any broken file
+    @logger.error("Failed to read the file. Skip processing.", :filename => filename, :exception => e.message)
   end
 
   def read_plain_file(filename, block)
@@ -278,9 +281,6 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
     while (line = buffered.readLine())
       block.call(line)
     end
-  rescue ZipException => e
-    @logger.error("Gzip codec: We cannot uncompress the gzip file", :filename => filename)
-    raise e
   ensure
     buffered.close unless buffered.nil?
     decoder.close unless decoder.nil?

data/logstash-input-s3.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-s3'
-  s.version         = '3.3.4'
-  s.licenses        = ['Apache License (2.0)']
+  s.version         = '3.3.5'
+  s.licenses        = ['Apache-2.0']
   s.summary         = "Streams events from files in a S3 bucket"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
   s.authors         = ["Elastic"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-s3
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.5
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ files:
 - spec/support/helpers.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
-- Apache License (2.0)
+- Apache-2.0
 metadata:
   logstash_plugin: 'true'
   logstash_group: input