fluent-plugin-openstack 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e54a564221292f123081d084e0e6c727f4b17e336920dfda4bf3c7a5bfa13074
-  data.tar.gz: 1c5db2176566037579a330bc0aca4622a0fd19d53611ac699a0b88f58e2c25e0
+  metadata.gz: 6245929676b87a8e8e60c7e0ca5341d21e70e9410278637c5f53de54e2083eb1
+  data.tar.gz: fbc7a5969c3be782355e8b6bc648b6caebe676601c39d48a1350dd60481bc911
 SHA512:
-  metadata.gz: 36f5258dd2a22e5a0862c64786c4ae48721f4e9138d6eb0677edd4a577b68c586ccbf2e0b7b55dddb43821e7729a6ac1554dfc0359e195bd219fcffc00359fbc
-  data.tar.gz: 67475166081c4eb359eac08a3a4eb19505f18e558a5853e5cc68a768ee1561dcb697116ea60d9b8326caee2aeaae0098574b10dc72f33b07bf22a9e2f2b857c0
+  metadata.gz: 0b1880f4051f4f863a4da8c9b0cd0cd1c0d50e19dd3fad747930a011d7009205cc22cf5aea2e5c1ef55b0d406231a435dd42c6060d91d94e7383f9601477f423
+  data.tar.gz: 556fb85b3ec2d36060ff6678a5cb15110d8a6d99e4e4b81d7ff7629ddf3f742eb753400cc0f7ae1d591ace1583599a4fdc71de67c7e9c59f40561189fc937617

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/fluent/plugin/out_swift.rb

@@ -36,7 +36,7 @@ module Fluent::Plugin
     desc 'If false, the certificate of endpoint will not be verified'
     config_param :ssl_verify, :bool, default: true
     desc 'The format of Swift object keys'
-    config_param :swift_object_key_format, :string, default: '%{path}/%{time_slice}_%{index}.%{file_extension}'
+    config_param :swift_object_key_format, :string, default: '%{path}/%Y%m%d_%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
@@ -105,13 +105,7 @@ module Fluent::Plugin
 
       self.formatter = formatter_create
       self.swift_object_key_format = configure_swift_object_key_format
-      # For backward compatibility
-      # TODO: Remove time_slice_format when end of support compat_parameters
       self.values_for_swift_object_chunk = {}
-
-      $log.warn("timekey_zone: #{timekey_zone}")
-
-      self.time_slice_with_tz = Fluent::Timezone.formatter(timekey_zone, config['time_slice_format'])
     end
 
     def multi_workers_ready?
@@ -130,7 +124,7 @@ module Fluent::Plugin
           openstack_region: auth_region
         )
       rescue StandardError => e
-        raise "Can't call Swift API. Please check your ENV OS_*, your credentials or auth_url configuration. Error: #{e.inspect}"
+        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
       check_container
@@ -138,26 +132,15 @@ module Fluent::Plugin
     end
 
     def format(tag, time, record)
-      r = inject_values_to_record(tag, time, record)
-      formatter.format(tag, time, r)
+      new_record = inject_values_to_record(tag, time, record)
+      formatter.format(tag, time, new_record)
     end
 
     def write(chunk)
       i = 0
       metadata = chunk.metadata
       previous_path = nil
-      time_slice = if metadata.timekey.nil?
-                     ''
-                   else
-                     $log.warn("timekey: #{metadata.timekey}")
-                     $log.warn("metadata: #{metadata}")
-                     time_slice_with_tz.call(metadata.timekey)
-                   end
-
       begin
-        $log.warn("time_slice: #{time_slice}")
-        $log.warn("index_format: #{index_format}")
-
         values_for_swift_object_chunk[chunk.unique_id] ||= {
           '%{hex_random}' => hex_random(chunk: chunk)
         }
@@ -167,7 +150,6 @@ module Fluent::Plugin
         }
         # rubocop:disable Style/FormatString
         values_for_swift_object_key_post = {
-          '%{time_slice}' => time_slice,
           '%{index}' => sprintf(index_format, i)
         }.merge!(values_for_swift_object_chunk[chunk.unique_id])
         # rubocop:enable Style/FormatString
@@ -191,6 +173,7 @@ module Fluent::Plugin
         swift_path = swift_path.gsub(/%{[^}]+}/, values_for_swift_object_key_post)
 
         $log.warn("swift_path 3: #{swift_path}")
+
         if i.positive? && (swift_path == previous_path)
           if overwrite
             log.warn("File: #{swift_path} already exists, but will overwrite!")
@@ -256,8 +239,7 @@ module Fluent::Plugin
                   :ext,
                   :mime_type,
                   :formatter,
-                  :values_for_swift_object_chunk,
-                  :time_slice_with_tz
+                  :values_for_swift_object_chunk
 
     def hex_random(chunk:)
       unique_hex = Fluent::UniqueId.hex(chunk.unique_id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-openstack
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - brissenden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd