fluent-plugin-cloudwatch-logs 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0dc91635c59f4a51c34d7356c8fcb014ed9bfbb
-  data.tar.gz: 2ce500d9be9c5af93eb7d3d952408ddb10e0458a
+  metadata.gz: 9e629c8fa1e69f1fc25b63be72d3891bed73eb92
+  data.tar.gz: cf4b8011d1c17117e09e00c421540717fb02064a
 SHA512:
-  metadata.gz: e7a2371942b64cccf0ac4c0b117fe8657e8a1f98fd11f8b27ba715dd84d24de1a76e1d2795daac079c6b93cba744ca34b295af2c05b8c83611440d0d543333c5
-  data.tar.gz: 8ae207ac8b8b2db382ed1aebe4653f2d662301169a708dad5820014e4c1b3ec2eea0795615d1f70e362d561ee9dd0a2998ec7c27bcf9719846cf7b99ffe839d5
+  metadata.gz: 56f19ed188cfae7f5672a2b3ac425c5c03ff43a454bdfa4a920df6ca368871b79c646e55dd8429340735c91c802b1740d74982430bc0dba084bf4df90b292db6
+  data.tar.gz: 05d706f093a4d4815b510df65730e85cabb5915adc66db0b7513596d936f05ad10651d2d8c3687f7da8125ff860ac719f1cd7c7ac4d03339ad968ab7127a175d

data/fluent-plugin-cloudwatch-logs.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'fluentd'
-  spec.add_dependency 'aws-sdk-core', '>= 2.0.7'
+  spec.add_dependency 'aws-sdk-core', '~> 2.0'
   spec.add_dependency 'fluent-mixin-config-placeholders', '>= 0.2.0'
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/fluent/plugin/cloudwatch/logs/version.rb

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Logs
-        VERSION = "0.4.0"
+        VERSION = "0.4.1"
       end
     end
   end

data/lib/fluent/plugin/in_cloudwatch_logs.rb

@@ -1,4 +1,5 @@
 require 'fluent/input'
+require 'fluent/parser'
 
 module Fluent
   require 'fluent/mixin/config_placeholders'
@@ -71,20 +72,23 @@ module Fluent
     private
     def configure_parser(conf)
       if conf['format']
-        @parser = TextParser.new
+        @parser = Fluent::TextParser.new
         @parser.configure(conf)
       end
     end
 
-    def next_token
-      return nil unless File.exist?(@state_file)
-      File.read(@state_file).chomp
+    def state_file_for(log_stream_name)
+      return "#{@state_file}_#{log_stream_name.gsub(File::SEPARATOR, '-')}" if log_stream_name
+      return @state_file
+    end
+
+    def next_token(log_stream_name)
+      return nil unless File.exist?(state_file_for(log_stream_name))
+      File.read(state_file_for(log_stream_name)).chomp
     end
 
     def store_next_token(token, log_stream_name = nil)
-      state_file = @state_file
-      state_file = "#{@state_file}_#{log_stream_name}" if log_stream_name
-      open(state_file, 'w') do |f|
+      open(state_file_for(log_stream_name), 'w') do |f|
         f.write token
       end
     end
@@ -102,13 +106,13 @@ module Fluent
               log_stream_name = log_stram.log_stream_name
               events = get_events(log_stream_name)
               events.each do |event|
-                emit(event)
+                emit(log_stream_name, event)
               end
             end
           else
             events = get_events(@log_stream_name)
             events.each do |event|
-              emit(event)
+              emit(log_stream_name, event)
             end
           end
         end
@@ -116,7 +120,7 @@ module Fluent
       end
     end
 
-    def emit(event)
+    def emit(stream, event)
       if @parser
         record = @parser.parse(event.message)
         router.emit(@tag, record[0], record[1])
@@ -132,7 +136,7 @@ module Fluent
         log_group_name: @log_group_name,
         log_stream_name: log_stream_name
       }
-      request[:next_token] = next_token if next_token
+      request[:next_token] = next_token(log_stream_name) if next_token(log_stream_name)
       response = @logs.get_log_events(request)
       store_next_token(response.next_forward_token, log_stream_name)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-logs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -28,16 +28,16 @@ dependencies:
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fluent-mixin-config-placeholders
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: CloudWatch Logs Plugin for Fluentd