fluent-plugin-cloudwatch-ingest 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da60017312c17b0017c447f0dd8b7da2c4803457
-  data.tar.gz: 9cfaec4d46eef8edd93155f00f7372759b3d4992
+  metadata.gz: fd7841c1d572b29c7281cb013d50891e7f516220
+  data.tar.gz: 2f17af0ba832d06aa21adff0ac5ddd5f0a619d6b
 SHA512:
-  metadata.gz: fe01a1b5df0135ddcaf47e24b0c4f0c9cddcc628f92c051fb59a0ed718d629496296c73a0b342762ecfb337635b28d237f91812522d2a139a256f3ca5a6cf7e4
-  data.tar.gz: 65de4d5cee4a6aa6f1422ba5f9b89bac09e714757fe39951db77a160a7f0d786ba3587b99f39fe13c008570ec96905c4eec74b173b820b767cfb0ee26aa3306e
+  metadata.gz: 1075e7279388aaa254e9ad81f5be0bbe1c0461d07022b9b1d095d4dc7450e0e08ceeb8b5a46dd5c7aa02b3760efe733ac05860f9e80eb70969a1e8584ad4bb00
+  data.tar.gz: 5f01bd527a5942c662449ccc1f06ada526d7ffb72185c6d92bfb24c0a02da7b537eb381dd2425c0f622aedeff31507f26a792c578f2dbbad481acc224ecc905f

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

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

data/lib/fluent/plugin/in_cloudwatch_ingest.rb

@@ -3,7 +3,7 @@ require 'fluent/plugin/parser'
 require 'fluent/config/error'
 require 'aws-sdk'
 require 'pathname'
-require 'yaml'
+require 'psych'
 
 module Fluent::Plugin
   class CloudwatchIngestInput < Fluent::Plugin::Input
@@ -191,32 +191,42 @@ module Fluent::Plugin
       attr_accessor :statefile
 
       def initialize(filepath, log)
+        @filepath = filepath
+        @log = log
+
         if File.exist?(statefile)
-          self.statefile = Pathname.new(filepath).open('r+')
+          self.statefile = Pathname.new(@filepath).open('r+')
         else
-          log.warn("No state file #{statefile} Creating a new one.")
+          @log.warn("No state file #{statefile} Creating a new one.")
           begin
-            self.statefile = Pathname.new(filepath).open('w+')
+            self.statefile = Pathname.new(@filepath).open('w+')
             save
           rescue => boom
-            log.error("Unable to create new state file #{statefile}: #{boom}")
+            @log.error("Unable to create new state file #{statefile}: #{boom}")
           end
         end
 
         # Attempt to obtain an exclusive flock on the file and raise and
         # exception if we can't
-        log.info("Obtaining exclusive lock on state file #{statefile}")
+        @log.info("Obtaining exclusive lock on state file #{statefile}")
         lockstatus = statefile.flock(File::LOCK_EX | File::LOCK_NB)
         raise CloudwatchIngestInput::State::LockFailed if lockstatus == false
 
-        merge!(YAML.safe_load(statefile.read))
-        log.info("Loaded state for #{keys.size} log groups from #{statefile}")
+        merge!(Psych.safe_load(statefile.read, [Fluent::Plugin::CloudwatchIngestInput::State])) # rubocop:disable all
+        @log.info("Loaded state for #{keys.size} log groups from #{statefile}")
+      end
+
+      # http://stackoverflow.com/questions/12821534/ruby-yaml-parser-by-passing-constructor
+      def init_with(coder)
+        @filepath = coder['filepath']
+        @log = coder['log']
       end
 
       def save
         statefile.rewind
-        statefile.write(YAML.dump(self))
-        log.info("Saved state to #{statefile}")
+        statefile.write(Psych.dump(self))
+        @log.info("Saved state to #{statefile}")
+        statefile.rewind
       end
 
       def close
@@ -226,7 +236,7 @@ module Fluent::Plugin
       def prune(log_groups)
         groups_before = keys.size
         delete_if { |k, _v| true unless log_groups.key?(k) }
-        log.info("Pruned #{groups_before - keys.size} keys from state file")
+        @log.info("Pruned #{groups_before - keys.size} keys from state file")
 
         # TODO: also prune streams as these are most likely to be transient
       end

metadata

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