fluent-plugin-directory 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e169ba627338c24ee1b4b2fa822d5a089847133e28515e975d90beaf2c72c9ba
-  data.tar.gz: '09c89e36f8f8577abf33ab004436233ff97a468d14ac8a5e8aa6eee8e307d35e'
+  metadata.gz: fb482c43b627800e8bb1ead02767e4d8d456f575a20d02c90b6cde2bfeb91e2f
+  data.tar.gz: 66444cc9b59e73f4ab92d54ba3d22a54b070aa7e80439760957e72773f1f1aa6
 SHA512:
-  metadata.gz: fb481b952c173b9d779931ef69dedb2aae46dcfe9bf1030774836b8c8cf95bdf64cd3295a650e151028b67b0b19f76bd48189d3064c9f42cd3d2811dde083683
-  data.tar.gz: 5192a3f3c29a018662c007e2c9fe320d71837a84c312ce725250c38207eeae79f962787cf425e1a2dcc81931f9bf05c1827dd1f58b4745b14f69421e402b5b5b
+  metadata.gz: 3295463622de8cca2f93bc6f87c3599b9a8a7ad98bffecb885b60ef37e058ed5ce84533b993981875d99ca0a7c60dc08a04f1db5094e71e278e299d61ead454a
+  data.tar.gz: 1b1cd0443e6a6431b1a373e831560d96c6181479da92585b8538f5895d252a60abcee5b53805f1c532c20a074819df0bf328b921b78978a52ac7201d1ea5ec05

data/README.md

@@ -26,13 +26,39 @@ $ bundle
 
 ## Configuration
 
-You can generate configuration template:
+### content_key (string) (optional)
 
-```
-$ fluent-plugin-config-format input directory
-```
+The name of the key whose value is the content of the file.
+
+Default value: `content`.
+
+### extension (string) (optional)
+
+The extension that will be added to the processed files.
+
+Default value: `.done`.
+
+### filename_key (string) (optional)
+
+The name of the key whose value is the name of the file.
+
+Default value: `filename`.
+
+### path (string) (required)
+
+The path of the folder to be scanned by the plugin.
+
+### run_interval (integer) (optional)
+
+The time interval (in seconds) to wait between scans.
+
+Default value: `60`.
+
+### tag (string) (required)
+
+The tag added to the output event.
 
-You can copy and paste generated documents here.
+- See also: [Input Plugin Overview](https://docs.fluentd.org/v/1.0/input#overview)
 
 ## Copyright
 

data/fluent-plugin-directory.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-directory"
-  spec.version = "0.1.0"
+  spec.version = "0.1.1"
   spec.authors = ["remyduthu@icloud.com"]
   spec.email   = ["remyduthu@icloud.com"]
 

data/lib/fluent/plugin/in_directory.rb

@@ -20,19 +20,18 @@ module Fluent
     class DirectoryInput < Fluent::Plugin::Input
       Fluent::Plugin.register_input('directory', self)
 
-      desc 'The name of the key whose value is the content of the file.'
-      config_param :content_key, :string, default: 'content'
+      helpers :timer
 
-      desc 'The extension that will be added to the processed files.'
-      config_param :extension, :string, default: '.done'
+      desc 'The field where the content of the file is stored in the output event.'
+      config_param :content_key, :string, default: 'content'
 
-      desc 'The name of the key whose value is the name of the file.'
+      desc 'The field where the name of the file is stored in the output event.'
       config_param :filename_key, :string, default: 'filename'
 
-      desc 'The path of the folder to be scanned by the plugin.'
+      desc 'The path of the folder to scan.'
       config_param :path, :string
 
-      desc 'The time interval (in seconds) to wait between scans.'
+      desc 'The interval (in seconds) to wait between scans.'
       config_param :run_interval, :integer, default: 60
 
       desc 'The tag added to the output event.'
@@ -41,9 +40,9 @@ module Fluent
       def start
         super
 
-        begin
-          # Scan files indefinitely
-          loop do
+        # See: https://docs.fluentd.org/plugin-helper-overview/api-plugin-helper-timer
+        timer_execute(:directory_timer, @run_interval) do
+          begin
             # Use a stream to submit multiple events at the same time
             multiEventStream = MultiEventStream.new
 
@@ -52,28 +51,22 @@ module Fluent
 
             # Read filenames in the directory
             Dir.glob(@path + '/*') do |filename|
-              # Ignore already processed files
-              next if filename.end_with? @extension
-
               # Add the record to the stream
               multiEventStream.add(
                 time,
-                { @content_key => File.read(filename), @file_key => filename }
+                { @content_key => File.read(filename), @file_key => filename },
               )
 
-              # Mark the file as processed
-              File.rename(filename, filename + @extension)
+              # Remove the file
+              File.delete(filename)
             end
 
             # Send the events
             router.emit_stream(tag, multiEventStream)
-
-            # Wait before the next scan
-            sleep(@run_interval)
+          rescue Exception => e
+            $log.warn 'Directory input error: ', e
+            $log.debug_backtrace(e.backtrace)
           end
-        rescue Exception => e
-          $log.warn 'Directory input error: ', e
-          $log.debug_backtrace(e.backtrace)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-directory
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - remyduthu@icloud.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler