Merge pull request #2721 from ganmacs/stdout-check-time-format

Make time_format configurable in stdout format
fluent · Dec 10, 2019 · 3679233 · 3679233
2 parents 5165986 + 4d59c07
commit 3679233
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/fluent/plugin/formatter_stdout.rb b/lib/fluent/plugin/formatter_stdout.rb
@@ -28,7 +28,7 @@ class StdoutFormatter < Formatter
       def configure(conf)
         super
 
-        @time_formatter = Strftime.new(TIME_FORMAT)
+        @time_formatter = Strftime.new(@time_format || TIME_FORMAT)
         @sub_formatter = Plugin.new_formatter(@output_type, parent: self.owner)
         @sub_formatter.configure(conf)
       end

diff --git a/test/plugin/test_out_stdout.rb b/test/plugin/test_out_stdout.rb
@@ -37,6 +37,25 @@ def create_driver(conf = CONFIG)
       end
     end
 
+    test 'configure with time_format' do
+      d = create_driver(CONFIG + <<-CONF)
+        <format>
+          @type stdout
+          time_format %Y-%m-%dT%H:%M:%S.%L%z
+        </format>
+      CONF
+
+      time = event_time
+      out = capture_log do
+        d.run(default_tag: 'test') do
+          d.feed(time, {'test' => 'test'})
+        end
+      end
+
+      t = Time.at(time).localtime.strftime("%Y-%m-%dT%H:%M:%S.%L%z")
+      assert_equal "#{t} test: {\"test\":\"test\"}\n", out
+    end
+
     test 'emit with default configuration' do
       d = create_driver
       time = event_time()