fluent-plugin-cloudwatch-logs 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa86963bdf4ec3faf83caed90ad1ab437ea2991d97e793d50a2e507e9ff0c1af
-  data.tar.gz: 4add147b77a03c2296469b21b188882a105d7736f5a576a6331aac9d266e4e34
+  metadata.gz: f4b45da3678f7685f04b1ca6053a2f396dd1847421002e4d7358d501916328f6
+  data.tar.gz: acc891b68cf5182063f4093c1b0c2db65c07f9b7e115bc05678128b97eb3d6b0
 SHA512:
-  metadata.gz: 7372c750e2947bf4b872b1f3f53c19494ed136274d0b9443f21ae32c8595e9d30968aae30a82a375a48ce6e7d0ce6429106b4ebe2c68bcdace4fd7801bc1648d
-  data.tar.gz: 1bc6416f7dc38a2479e01a4847bf4241e0c29cbd7ac531e05faa9d4da2cec2cc7cc428b76f2a726c9fda173e4d6d2c51a24cb03b70b0db05fc032e12088c7245
+  metadata.gz: dd37edc8daf19fc3c8b2ea3df12786b906960f546dbd8bb9bcdcf047cb602138ee215edac5dc51891c3956ef95e7ec05a512219d62e18974dfdb03a16f62595a
+  data.tar.gz: 6f102f4499c68f3ee2ebeacf388ecafa9cf21d3d0c5b3091420986b5dd8b5849a75fdd1c59a274892592b2e7dab0613e71829b3986905c144dd20e4c8aec02b5

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

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Logs
-        VERSION = "0.8.2"
+        VERSION = "0.9.0"
       end
     end
   end

data/lib/fluent/plugin/out_cloudwatch_logs.rb

@@ -455,7 +455,7 @@ module Fluent::Plugin
     def log_group_exists?(group_name)
       if @sequence_tokens[group_name]
         true
-      elsif @logs.describe_log_groups.any? {|page| page.log_groups.any? {|i| i.log_group_name == group_name } }
+      elsif check_log_group_existence(group_name)
         @sequence_tokens[group_name] = {}
         true
       else
@@ -463,6 +463,17 @@ module Fluent::Plugin
       end
     end
 
+    def check_log_group_existence(group_name)
+      response = @logs.describe_log_groups(log_group_name_prefix: group_name)
+      response.each {|page|
+        if page.log_groups.find {|i| i.log_group_name == group_name }
+          return true
+        end
+      }
+
+      false
+    end
+
     def log_stream_exists?(group_name, stream_name)
       if not @sequence_tokens[group_name]
         false
@@ -477,19 +488,15 @@ module Fluent::Plugin
     end
 
     def find_log_stream(group_name, stream_name)
-      next_token = nil
-      loop do
-        response = @logs.describe_log_streams(log_group_name: group_name, log_stream_name_prefix: stream_name, next_token: next_token)
-        if (log_stream = response.log_streams.find {|i| i.log_stream_name == stream_name })
+      response = @logs.describe_log_streams(log_group_name: group_name, log_stream_name_prefix: stream_name)
+      response.each {|page|
+        if (log_stream = page.log_streams.find {|i| i.log_stream_name == stream_name })
           return log_stream
         end
-        if response.next_token.nil?
-          break
-        end
-        next_token = response.next_token
         sleep 0.1
-      end
-      nil
+      }
     end
+
+    nil
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-logs
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd