fluent-plugin-s3 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5f479caba1c3280aa3d9cb83186473afb3c192c
-  data.tar.gz: b1d0ed15c3cee9e9fa3f3b39668f2676f6471870
+  metadata.gz: 55e080d8a3659c9031a55c444803d30f9fc748de
+  data.tar.gz: 09d5d7227c24f4f997e88d7a5d8ea41fb24aaf1a
 SHA512:
-  metadata.gz: a37ef95d2298ca9f64fbc72fb5facec926862d0dedc40420f6f19baae4af32d16fb44be0122c2788355b29244ba804e9fdfd9b6263615860c7796a32b32a3870
-  data.tar.gz: 3286ceedbd344873fd79987f2f413096e579b2164c932200943fefd1e6cff467a3aa78abd6991d10a15cc3d9d16c965efdc915da20ffc5f713daca9fc9b31fbf
+  metadata.gz: 49e4ba0663061d8443a9603a0d465b491a23f4e286d1e620d8f1cb8a5bbde204c0a274d60c088181e22b181a702881ca39664764b88fc02ad75d73615a604ebc
+  data.tar.gz: 13da940d95c312cf99f7fc632493a2d1c5b36e397528212a45de930520c61250e7f798a2d6f498d9d7e6825f5b660e7cedfabb6462b33d53782eafd66d600ec5

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.7.2 - 2016/10/20
+
+  * in_s3: Replace old parser API with new one
+  * in_s3: Don't stop SQS polling when error happens
+
+
 Release 0.7.1 - 2016/09/02
 
   * Support IAM role for Amazon ECS task

data/README.md

@@ -47,7 +47,8 @@ Simply use RubyGems:
 **aws_key_id**
 
 AWS access key id. This parameter is required when your agent is not
-running on EC2 instance with an IAM Role.
+running on EC2 instance with an IAM Role. When using an IAM role, make 
+sure to configure `instance_profile_credentials`. Usage can be found below.
 
 **aws_sec_key**
 

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/fluent/plugin/in_s3.rb

@@ -148,8 +148,8 @@ module Fluent
 
           process(body)
         rescue => e
-          log.warn "#{e.message}\n#{e.backtrace.join("\n")}"
-          @running = false
+          log.warn(error: e)
+          log.warn_backtrace(e.backtrace)
           throw :skip_delete
         end
       end
@@ -217,10 +217,13 @@ module Fluent
 
       io = @bucket.object(key).get.body
       content = @extractor.extract(io)
+      es = MultiEventStream.new
       content.each_line do |line|
-        time, record = @parser.parse(line)
-        router.emit(@tag, time, record)
+        @parser.parse(line) do |time, record|
+          es.add(time, record)
+        end
       end
+      router.emit_stream(@tag, es)
     end
 
     class Extractor

data/test/test_in_s3.rb

@@ -12,6 +12,9 @@ class S3InputTest < Test::Unit::TestCase
     Fluent::Test.setup
     @time = Time.parse("2015-09-30 13:14:15 UTC").to_i
     Fluent::Engine.now = @time
+    if Fluent.const_defined?(:EventTime)
+      stub(Fluent::EventTime).now { @time }
+    end
   end
 
   CONFIG = %[
@@ -178,9 +181,7 @@ class S3InputTest < Test::Unit::TestCase
       [message]
     }
     assert_nothing_raised do
-      d.run do
-        d.instance.router.emit("input.s3", @time, { "message" => "aaa" })
-      end
+      d.run
     end
   end
 
@@ -218,11 +219,7 @@ class S3InputTest < Test::Unit::TestCase
       [message]
     }
     assert_nothing_raised do
-      d.run do
-        d.instance.router.emit("input.s3", @time, { "message" => "aaa\n" })
-        d.instance.router.emit("input.s3", @time, { "message" => "bbb\n" })
-        d.instance.router.emit("input.s3", @time, { "message" => "ccc\n" })
-      end
+      d.run
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-s3
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd