fluent-plugin-openstack 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06a0c041064730e725a9158aef6676b03b0011210b487c803d6ff64bfc638a09
-  data.tar.gz: 69e70773725e0c314aea8be0fca6d97e90a631508fede9dcd82b80af72d0f12f
+  metadata.gz: 06b4ee6c0a7f57cb946378c1d2813c845fddd4f06420b3499002bef45e7fdadf
+  data.tar.gz: 247e316a55a1b29b2f7094a7b49dc7db56eafd42635b05ceaae60fe13edfdf9f
 SHA512:
-  metadata.gz: 16bc5cd87145dab325e1606f0e72e82dbedebfbdaa92e8dbb3a58a03aea2fb08bca991a5360038f3c3a772bbfe72035e1826e4f5a16dec0d358f01eea45d4d95
-  data.tar.gz: 5a06aa344f159d3e6d048ed3db9f70b111fa0369bd5b2c4cb6ebe20ef28daa294a4932140040d8fffd4da979f42b63348500feb9dc4e4b75a0d085663bc81179
+  metadata.gz: cf7e4f145523b545190a99123091ddf5e4b2e0c25eb2b7f3fb5871369a131a34770e7a62f651b3bc349001cf9b81eed14929ae7397a9dd9901ebc6994b08ccc2
+  data.tar.gz: 703015c28047f081a869a3f62fd5bffaf89da0b567eb35b7f76f187bef638296962f4c5566f941e0a4d2c1ff4abe2bfb0f46997c597ddbfc15fda7590187950d

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/lib/fluent/plugin/out_swift.rb

@@ -15,9 +15,9 @@ module Fluent::Plugin
     DEFAULT_FORMAT_TYPE = 'out_file'
     MAX_HEX_RANDOM_LENGTH = 16
 
+    # OpenStack
     desc 'Path prefix of the files on Swift'
     config_param :path, :string, default: '%Y%m%d'
-    # OpenStack AUTH
     desc "Authentication URL. Set a value or `#{ENV['OS_AUTH_URL']}`"
     config_param :auth_url, :string
     desc "Authentication User Name. If you use TempAuth, auth_user is ACCOUNT:USER. Set a value or use `#{ENV['OS_USERNAME']}`"
@@ -28,7 +28,6 @@ module Fluent::Plugin
     desc "Authentication Region. Optional, not required if there is only one region available. Set a value or use `#{ENV['OS_REGION_NAME']}`"
     config_param :auth_region, :string, default: nil
     config_param :swift_account, :string, default: nil
-
     desc 'Swift container name'
     config_param :swift_container, :string
     desc 'Archive format on Swift'
@@ -39,9 +38,6 @@ module Fluent::Plugin
     config_param :swift_object_key_format, :string, default: '%{path}/%H%M_%{index}.%{file_extension}'
     desc 'Create Swift container if it does not exists'
     config_param :auto_create_container, :bool, default: true
-    config_param :check_apikey_on_start, :bool, default: true
-    desc 'URI of proxy environment'
-    config_param :proxy_uri, :string, default: nil
     desc 'The length of `%{hex_random}` placeholder (4 - 16)'
     config_param :hex_random_length, :integer, default: 4
     desc '`sprintf` format for `%{index}`'
@@ -53,9 +49,10 @@ module Fluent::Plugin
       config_set_default :@type, DEFAULT_FORMAT_TYPE
     end
 
+    # https://docs.fluentd.org/configuration/buffer-section#time
     config_section :buffer do
       config_set_default :chunk_keys, ['time']
-      config_set_default :timekey, 60 * 60
+      config_set_default :timekey, 3600
       config_set_default :timekey_wait, 60
     end
 
@@ -104,7 +101,7 @@ module Fluent::Plugin
 
       self.formatter = formatter_create
       self.swift_object_key_format = configure_swift_object_key_format
-      self.values_for_swift_object_chunk = {}
+      self.swift_object_chunk_buffer = {}
     end
 
     def multi_workers_ready?
@@ -125,11 +122,14 @@ module Fluent::Plugin
       rescue StandardError => e
         raise "Can't call Swift API. Please check your ENV OS_*, your credentials or `auth_url` configuration. Error: #{e.inspect}"
       end
-      storage.change_account(swift_account) if swift_account
+      if swift_account
+        storage.change_account(swift_account)
+      end
       check_container
       super
     end
 
+    # https://docs.fluentd.org/plugin-development/api-plugin-formatter
     def format(tag, time, record)
       new_record = inject_values_to_record(tag, time, record)
       formatter.format(tag, time, new_record)
@@ -140,7 +140,7 @@ module Fluent::Plugin
       metadata = chunk.metadata
       previous_path = nil
       begin
-        values_for_swift_object_chunk[chunk.unique_id] ||= {
+        swift_object_chunk_buffer[chunk.unique_id] ||= {
           '%{hex_random}' => hex_random(chunk: chunk)
         }
         values_for_swift_object_key_pre = {
@@ -150,7 +150,7 @@ module Fluent::Plugin
         # rubocop:disable Style/FormatString
         values_for_swift_object_key_post = {
           '%{index}' => sprintf(index_format, i)
-        }.merge!(values_for_swift_object_chunk[chunk.unique_id])
+        }.merge!(swift_object_chunk_buffer[chunk.unique_id])
         # rubocop:enable Style/FormatString
 
         if uuid_flush_enabled
@@ -160,16 +160,10 @@ module Fluent::Plugin
         swift_path = swift_object_key_format.gsub(/%{[^}]+}/) do |matched_key|
           values_for_swift_object_key_pre.fetch(matched_key, matched_key)
         end
-
-        $log.warn("swift_path: #{swift_path}")
-
         swift_path = extract_placeholders(swift_path, metadata)
-
-        $log.warn("swift_path: #{swift_path}")
-
         swift_path = swift_path.gsub(/%{[^}]+}/, values_for_swift_object_key_post)
 
-        $log.warn("swift_path: #{swift_path}")
+        $log.warn("File flushing: #{swift_path}")
 
         if i.positive? && (swift_path == previous_path)
           if overwrite
@@ -208,7 +202,7 @@ module Fluent::Plugin
             file,
             content_type: mime_type
           )
-          values_for_swift_object_chunk.delete(chunk.unique_id)
+          swift_object_chunk_buffer.delete(chunk.unique_id)
         end
       ensure
         begin
@@ -236,7 +230,7 @@ module Fluent::Plugin
                   :ext,
                   :mime_type,
                   :formatter,
-                  :values_for_swift_object_chunk
+                  :swift_object_chunk_buffer
 
     def hex_random(chunk:)
       unique_hex = Fluent::UniqueId.hex(chunk.unique_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-openstack
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - brissenden