logstash-input-s3-sns-sqs 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f80cbe20a92d1a3041719215f1e7324c3bd5043798b522ff4faa9fa826c2d4f3
-  data.tar.gz: d64c634282dc1c60bdb4afac9dc98ee92937ed673b26cb7bb9c1ef782032d3df
+  metadata.gz: 037f46eeeb1316d0e6a108b5f573ebc9a56649a3ddc0d97276898defbf1e3c5e
+  data.tar.gz: f5b670848c3c7c4da6d00a9a8e224bfe11447eafda3dc0d4f9e03a90e1890562
 SHA512:
-  metadata.gz: 10772e588d70541bbf235417845ddcc7c6fb9487e505fe2dea86d83335a6cdaabb1f1d76834c409045f64a89754a8bc3196579c92262755a9b217417901ff37d
-  data.tar.gz: 2ee44300b3dfb57a5d35d23d698ded44979d1612dee1dc790f08946fdbc5ac1426fc86595684e107ffcdd95838fc69e15754483984a04e02e44f393b07e774a3
+  metadata.gz: d8be989f95a4651d4283b4770da33544bfe30d417b44d9de982fbf203a37e310cdb9cc7d3ebfe1be7d798bdc843ce9033762798f2bad2f5b62d6b09657cdbc4c
+  data.tar.gz: e57bed2000ed438e4ee2b543251f2757dd9fea2c8ad6d7d7aa93c9d9083c726e9fcc12c51eaa8bda2322ac12cb975d5c26e7bda34a922123561698e846f28f25

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 ##2.0.2
 FIX:
+- Terminate every input line by \n (BufferedReader does not)
 - Wrong input for type folder, leads to empty types
 ##2.0.1
 FIX:

data/lib/logstash/inputs/s3snssqs.rb

@@ -25,6 +25,7 @@ java_import java.io.FileInputStream
 java_import java.io.BufferedReader
 java_import java.util.zip.GZIPInputStream
 java_import java.util.zip.ZipException
+import java.lang.StringBuilder
 
 # our helper classes
 # these may go into this file for brevity...
@@ -326,6 +327,7 @@ class LogStash::Inputs::S3SNSSQS < LogStash::Inputs::Threadable
     if match = /#{s3_key_prefix}\/?(?<type_folder>.*?)\/.*/.match(key)
       return match['type_folder']
     else
+      #FIXME should be NIL instedt of empty sting?
       return ""
     end
   end

data/lib/logstash/inputs/s3snssqs/log_processor.rb

@@ -75,8 +75,7 @@ module LogProcessor
     @logger.warn("Problem while gzip detection", :error => e)
   end
 
-  def read_file(filename, &block)
-    #@logger.info("begin read_file",:thread => Thread.current[:name])
+  def read_file(filename)
     completed = false
     zipped = gzip?(filename)
     file_stream = FileInputStream.new(filename)
@@ -87,28 +86,23 @@ module LogProcessor
       decoder = InputStreamReader.new(file_stream, 'UTF-8')
     end
     buffered = BufferedReader.new(decoder)
-    line = buffered.readLine()
-    #@logger.info("read first line", :line => line)
-    while (!line.nil?)
-      block.call(line)
-      line = buffered.readLine()
-      #@logger.info("next line read",:line => line)
+
+    while (data = buffered.readLine())
+      line = StringBuilder.new(data).append("\n")
+      yield(line.toString())
     end
-    #@logger.info("finished read_file",:thread => Thread.current[:name])
     completed = true
-
   rescue ZipException => e
     @logger.error("Gzip codec: We cannot uncompress the gzip file", :filename => filename, :error => e)
-    return nil
   ensure
     buffered.close unless buffered.nil?
     decoder.close unless decoder.nil?
     gzip_stream.close unless gzip_stream.nil?
     file_stream.close unless file_stream.nil?
     throw :skip_delete unless completed
-    return nil
   end
 
+
   def event_is_metadata?(event)
     return false unless event.get("message").class == String
     line = event.get("message")

data/logstash-input-s3-sns-sqs.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-input-s3-sns-sqs'
-  s.version         = '2.0.2'
+  s.version         = '2.0.3'
   s.licenses        = ['Apache-2.0']
   s.summary         = "Get logs from AWS s3 buckets as issued by an object-created event via sns -> sqs."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-s3-sns-sqs
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Christian Herweg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement