fluent-plugin-cloudwatch-ingest 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85240eae52c76e8a134b9ce96e0f323e75031950
-  data.tar.gz: f0bde80bbec5883fd8a07a426c0ba6ed7e778e54
+  metadata.gz: 58a93e19106bcad0953826e4b33535464475fc60
+  data.tar.gz: 4792383889e4fa1aac9e450f44e27c2161e3eccd
 SHA512:
-  metadata.gz: 51d80f4bd9d04a6cc4caf75742aa0db06a3a5d60da158e34651e4e7dd8ebfae0d4284f1ea70e9968909aaa14b3139f3462339be2cc7f8c830acae452ba71a12f
-  data.tar.gz: 519f05819fda63aef3a6bafb39ccc287716455071bbc074e10103bf239a10817c92aeef9c351893b2a4e65f330acf1c07e56ad097a6865187ea4b17d9322e9ce
+  metadata.gz: 9d376ab39d539794646fb3d29348e68daafac482fe59251eb07cb745f03e820a3ebf37efe304a6630ce8fdcee1a66b46360ae3a72d3a67a75447f5c676cd31f3
+  data.tar.gz: 98a9976a3e97f37e5e123f78759a6bcbc4b57ff691db303dbffadb1b252003726d09e9dc5420b7eddbaee9ef20b4ace08377ab405e795e5816991dafd4136a26

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

@@ -2,7 +2,7 @@ module Fluent
   module Plugin
     module Cloudwatch
       module Ingest
-        VERSION = '0.1.15'.freeze
+        VERSION = '0.1.16'.freeze
       end
     end
   end

data/lib/fluent/plugin/in_cloudwatch_ingest.rb

@@ -146,7 +146,8 @@ module Fluent::Plugin
             # See if we have some stored state for this group and stream.
             # If we have then use the stored forward_token to pick up
             # from that point. Otherwise start from the start.
-            stream_token = (state[group][stream] if state[group][stream])
+            stream_token =
+              (state.store[group][stream] if state.store[group][stream])
 
             begin
               loop do
@@ -163,7 +164,7 @@ module Fluent::Plugin
 
               # Once all events for this stream have been processed,
               # store the forward token
-              state[group][stream] = response.next_forward_token
+              state.store[group][stream] = response.next_forward_token
             rescue => boom
               log.error("Unable to retrieve events for stream
                 #{stream} in group #{group}: #{boom}")
@@ -186,13 +187,14 @@ module Fluent::Plugin
       end
     end
 
-    class CloudwatchIngestInput::State < Hash
+    class CloudwatchIngestInput::State
       class LockFailed < RuntimeError; end
-      attr_accessor :statefile
+      attr_accessor :statefile, :store
 
       def initialize(filepath, log)
         @filepath = filepath
         @log = log
+        @store = {}
 
         if File.exist?(statefile)
           self.statefile = Pathname.new(@filepath).open('r+')
@@ -212,14 +214,17 @@ module Fluent::Plugin
         lockstatus = statefile.flock(File::LOCK_EX | File::LOCK_NB)
         raise CloudwatchIngestInput::State::LockFailed if lockstatus == false
 
-        merge!(Psych.safe_load(statefile.read, [Fluent::Plugin::CloudwatchIngestInput::State])) # rubocop:disable all
-        @log.info("Loaded state for #{keys.size} log groups from #{statefile}")
+        @store.merge!(Psych.safe_load(statefile.read, [Fluent::Plugin::CloudwatchIngestInput::State])) # rubocop:disable all
+        @log.info("Loaded #{@store.keys.size} log groups from #{statefile}")
       end
 
       # http://stackoverflow.com/questions/12821534/ruby-yaml-parser-by-passing-constructor
+      def encode_with(coder)
+        coder['store'] = @store
+      end
+
       def init_with(coder)
-        @filepath = @filepath ? @filepath : coder['filepath']
-        @log = @log ? @log : coder['log']
+        @store = coder['store']
       end
 
       def save
@@ -234,8 +239,8 @@ module Fluent::Plugin
       end
 
       def prune(log_groups)
-        groups_before = keys.size
-        delete_if { |k, _v| true unless log_groups.key?(k) }
+        groups_before = @store.keys.size
+        @store.delete_if { |k, _v| true unless log_groups.key?(k) }
         @log.info("Pruned #{groups_before - keys.size} keys from state file")
 
         # TODO: also prune streams as these are most likely to be transient

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-cloudwatch-ingest
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Sam Pointer