fluent-plugin-webhdfs 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4637e563a9e04c877cd6d897d013ac57a63d1a80
-  data.tar.gz: 305a8e89b883175c47b4fc9811fd1a27f9773141
+  metadata.gz: 39cdb79659d5d95293f47ef4c3ae99e8827a3af9
+  data.tar.gz: 91674f2e77c578f1f7761c41e971495541c30043
 SHA512:
-  metadata.gz: ded6f6b4ba2ca28fa49be0a4a23127ec643d1adfc046c7cb14d37cc91ad90705252ac7cc986439c0793849c876ffcf88c5b6abc21a4ba9f7284c6933e07a8632
-  data.tar.gz: 1e1d5b936463bfab84baeec2cf9b6064dcd25890712f8d315b5a18457dc87087c4270a2a2f1cdf0a9e390c91345bb9ac1eb739088644537c0a6bae1564cf1325
+  metadata.gz: 6d72ec81812d8fb264ccde08e0dfb4c4d06605f488509cff5046539e070e840fe2ca9b7e0caa481778f325b1dbf3a4bda2fe632cc007d1be6053c9dceb939de0
+  data.tar.gz: 3c258d6362c05f6778bbf5d6b9e18d96565ed4914d15c8988bfd0334d14ccbdb1d4d3c26073b8d8700931a64cb9667b7c3413db2d87aaae693b78be3f3341a23

data/README.md

@@ -1,5 +1,7 @@
 # fluent-plugin-webhdfs
 
+[![Build Status](https://travis-ci.org/fluent/fluent-plugin-webhdfs.svg?branch=master)](https://travis-ci.org/fluent/fluent-plugin-webhdfs)
+
 [Fluentd](http://fluentd.org/) output plugin to write data into Hadoop HDFS over WebHDFS/HttpFs.
 
 "webhdfs" output plugin formats data into plain text, and store it as files on HDFS. This plugin supports:

data/fluent-plugin-webhdfs.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-webhdfs"
-  gem.version       = "1.2.2"
+  gem.version       = "1.2.3"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.summary       = %q{Fluentd plugin to write data on HDFS over WebHDFS, with flexible formatting}

data/lib/fluent/plugin/out_webhdfs.rb

@@ -98,20 +98,27 @@ class Fluent::Plugin::WebHDFSOutput < Fluent::Plugin::Output
   end
 
   def configure(conf)
-    compat_parameters_convert(conf, :buffer, default_chunk_key: "time")
-
+    # #compat_parameters_convert ignore time format in conf["path"],
+    # so check conf["path"] and overwrite the default value later if needed
     timekey = case conf["path"]
               when /%S/ then 1
               when /%M/ then 60
               when /%H/ then 3600
               else 86400
               end
+    if buffer_config = conf.elements(name: "buffer").first
+      timekey = buffer_config["timekey"] || timekey 
+    end
+
+    compat_parameters_convert(conf, :buffer, default_chunk_key: "time")
+
     if conf.elements(name: "buffer").empty?
       e = Fluent::Config::Element.new("buffer", "time", {}, [])
       conf.elements << e
     end
     buffer_config = conf.elements(name: "buffer").first
-    buffer_config["timekey"] = timekey unless buffer_config["timekey"]
+    # explicitly set timekey
+    buffer_config["timekey"] = timekey
 
     compat_parameters_convert_plaintextformatter(conf)
     verify_config_placeholders_in_path!(conf)

data/test/plugin/test_out_webhdfs.rb

@@ -207,6 +207,21 @@ class WebHDFSOutputTest < Test::Unit::TestCase
       assert_equal 1, d.instance.buffer_config.timekey
       assert_equal "/hdfs/path/file.20120718.log", d.instance.generate_path(chunk)
     end
+
+    def test_time_key_without_buffer_section
+      conf = config_element(
+        "ROOT", "", {
+          "host" => "namenode.local",
+          "path" => "/hdfs/path/file.%Y%m%d-%M.log"
+        }
+      )
+      d = create_driver(conf)
+      time = event_time("2012-07-18 15:03:00 +0900")
+      metadata = d.instance.metadata("test", time, {})
+      chunk = d.instance.buffer.generate_chunk(metadata)
+      assert_equal 60, d.instance.buffer_config.timekey
+      assert_equal "/hdfs/path/file.20120718-03.log", d.instance.generate_path(chunk)
+    end
   end
 
   sub_test_case "using format subsection" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-webhdfs
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to write data on HDFS over WebHDFS, with flexible formatting