fluentd 1.15.3 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e7d3798a39136da859e23e8bee742d8db252f58ce410cc530710d60dba36c05
-  data.tar.gz: 82146c03770da1ebbad670fbd356a3020846f27d72e1eaeaed9538fc0b99c9cb
+  metadata.gz: 6fc34e74bc59490b0c8a3416ce9028aa92883d875a9d0f20ac4cddfc95bb40d0
+  data.tar.gz: 4cdd96916326fceed441e564b82c7024143ee6f179c37d1eb0a3b3746d2d9850
 SHA512:
-  metadata.gz: 4b895809bf5e79c5fea8e5a77a485129d8a5912327fb7cbfc176a85e77918068cf24db37cf6e8fba53f24bbdb7e6af7d593a621bcad575faf4299589c8cb662c
-  data.tar.gz: a0985cfd48858c88f7ec9feb5c87e035361998ae50be98d6f486d9ae897cce350cf1878cd4a2491c40c6faa5a1cb67b3c52484d1100694bb624894635b8bebd6
+  metadata.gz: 219d732710b6a7d9f385b4a6a8c254b00f2c6eb98f96fea27e0d1d5947056fa67213a8f5fd5b08361adb92fa7fe2d00e20e4a3bb410523de2538b1a1572214ea
+  data.tar.gz: 4350fa09941c69bff107d383fd6c5b4a084f579843b2d65bd979da612418e0e9bc2185dd6dca96e0d77cc03a1d3b79bf0e9856d9f4abc9d7336af4b50b95a41b

data/.github/workflows/linux-test.yaml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.1', '3.0', '2.7']
+        ruby-version: ['3.2', '3.1', '3.0', '2.7']
         os: [ubuntu-latest]
         experimental: [false]
         include:
@@ -23,7 +23,7 @@ jobs:
 
     name: Unit testing with Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/macos-test.yaml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.1', '3.0', '2.7']
+        ruby-version: ['3.2', '3.1', '3.0', '2.7']
         os: [macos-latest]
         experimental: [true]
         include:
@@ -23,7 +23,7 @@ jobs:
 
     name: Unit testing with Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/windows-test.yaml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.1', '2.7']
+        ruby-version: ['3.2', '3.1', '2.7']
         os:
           - windows-latest
         experimental: [false]
@@ -35,7 +35,7 @@ jobs:
 
     name: Unit testing with Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/CHANGELOG.md

@@ -1,3 +1,80 @@
+# v1.16
+
+## Release v1.16.0 - 2023/03/29
+
+### Enhancement
+
+* in_tcp: Add `send_keepalive_packet` option
+  https://github.com/fluent/fluentd/pull/3961
+* buffer: backup broken file chunk
+  https://github.com/fluent/fluentd/pull/4025
+* Add warning messages for restoring buffer with `flush_at_shutdown true`
+  https://github.com/fluent/fluentd/pull/4027
+* Add logs for time period of restored buffer possibly broken
+  https://github.com/fluent/fluentd/pull/4028
+
+### Bug Fix
+
+* http_server_helper: Fix format of log messages originating from Async gem
+  https://github.com/fluent/fluentd/pull/3987
+* Change to not generate a sigdump file after receiving a `SIGTERM` signal on
+  non-Windows
+  https://github.com/fluent/fluentd/pull/4034
+  https://github.com/fluent/fluentd/pull/4043
+* out_forward: fix error of ack handling conflict on stopping with
+  `require_ack_response` enabled
+  https://github.com/fluent/fluentd/pull/4030
+* Fix problem that some `system` configs are not reflected
+  https://github.com/fluent/fluentd/pull/4064
+  https://github.com/fluent/fluentd/pull/4065
+  https://github.com/fluent/fluentd/pull/4086
+  https://github.com/fluent/fluentd/pull/4090
+  https://github.com/fluent/fluentd/pull/4096
+* Fix bug that the logger outputs some initial log messages without applying
+  some settings such as `format`
+  https://github.com/fluent/fluentd/pull/4091
+* Windows: Fix a bug that the wrong log file is reopened with log rotate setting
+  when flushing or graceful reloading
+  https://github.com/fluent/fluentd/pull/4054
+* Fix race condition of out_secondary_file
+  https://github.com/fluent/fluentd/pull/4081
+* Suppress warning using different secondary for out_secondary_file
+  https://github.com/fluent/fluentd/pull/4087
+* Fix value of `system_config.workers` at `run_configure`.
+  Change argument type of `Fluent::Plugin::Base::configure()` to
+  `Fluent::Config::Element` only.
+  https://github.com/fluent/fluentd/pull/4066
+* Fix bug that Fluentd sometimes tries to use an unavailable port and fails to
+  start on Windows
+  https://github.com/fluent/fluentd/pull/4092
+
+### Misc
+
+* Add method for testing `filtered_with_time`
+  https://github.com/fluent/fluentd/pull/3899
+* Replace `$$` with `Process.pid`
+  https://github.com/fluent/fluentd/pull/4040
+* Relax required webric gem version
+  https://github.com/fluent/fluentd/pull/4061
+* CI fixes to support Ruby 3.2
+  https://github.com/fluent/fluentd/pull/3968
+  https://github.com/fluent/fluentd/pull/3996
+  https://github.com/fluent/fluentd/pull/3997
+* Other CI fixes
+  https://github.com/fluent/fluentd/pull/3969
+  https://github.com/fluent/fluentd/pull/3990
+  https://github.com/fluent/fluentd/pull/4013
+  https://github.com/fluent/fluentd/pull/4033
+  https://github.com/fluent/fluentd/pull/4044
+  https://github.com/fluent/fluentd/pull/4050
+  https://github.com/fluent/fluentd/pull/4062
+  https://github.com/fluent/fluentd/pull/4074
+  https://github.com/fluent/fluentd/pull/4082
+  https://github.com/fluent/fluentd/pull/4085
+* Update MAINTAINERS.md
+  https://github.com/fluent/fluentd/pull/4026
+  https://github.com/fluent/fluentd/pull/4069
+
 # v1.15
 
 ## Release v1.15.3 - 2022/11/02

data/MAINTAINERS.md

@@ -5,7 +5,9 @@
 - [Hiroshi Hatake](https://github.com/cosmo0920), [Calyptia](https://calyptia.com/)
 - [Masahiro Nakagawa](https://github.com/repeatedly), [Treasure Data](https://www.treasuredata.com/)
 - [Satoshi Tagomori](https://github.com/tagomoris), [Treasure Data](https://www.treasuredata.com/)
+- [Toru Takahashi](https://github.com/toru-takahashi), [Treasure Data](https://www.treasuredata.com/)
 - [Eduardo Silva](https://github.com/edsiper), [Calyptia](https://calyptia/)
 - [Fujimoto Seiji](https://github.com/fujimots), [ClearCode](https://www.clear-code.com/)
 - [Takuro Ashie](https://github.com/ashie), [ClearCode](https://www.clear-code.com/)
 - [Kentaro Hayashi](https://github.com/kenhys), [ClearCode](https://www.clear-code.com/)
+- [Daijiro Fukuda](https://github.com/daipom), [ClearCode](https://www.clear-code.com/)

data/README.md

@@ -4,7 +4,6 @@ Fluentd: Open-Source Log Collector
 [![Testing on Ubuntu](https://github.com/fluent/fluentd/actions/workflows/linux-test.yaml/badge.svg?branch=master)](https://github.com/fluent/fluentd/actions/workflows/linux-test.yaml)
 [![Testing on Windows](https://github.com/fluent/fluentd/actions/workflows/windows-test.yaml/badge.svg?branch=master)](https://github.com/fluent/fluentd/actions/workflows/windows-test.yaml)
 [![Testing on macOS](https://github.com/fluent/fluentd/actions/workflows/macos-test.yaml/badge.svg?branch=master)](https://github.com/fluent/fluentd/actions/workflows/macos-test.yaml)
-[![Testing on Arm64](https://cloud.drone.io/api/badges/fluent/fluentd/status.svg?branch=master)](https://cloud.drone.io/fluent/fluentd)
 [![Code Climate](https://codeclimate.com/github/fluent/fluentd/badges/gpa.svg)](https://codeclimate.com/github/fluent/fluentd)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1189/badge)](https://bestpractices.coreinfrastructure.org/projects/1189)
 

data/fluentd.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency("msgpack", [">= 1.3.1", "< 2.0.0"])
   gem.add_runtime_dependency("yajl-ruby", ["~> 1.0"])
   gem.add_runtime_dependency("cool.io", [">= 1.4.5", "< 2.0.0"])
-  gem.add_runtime_dependency("serverengine", [">= 2.3.0", "< 3.0.0"])
+  gem.add_runtime_dependency("serverengine", [">= 2.3.2", "< 3.0.0"])
   gem.add_runtime_dependency("http_parser.rb", [">= 0.5.1", "< 0.9.0"])
   gem.add_runtime_dependency("sigdump", ["~> 0.2.2"])
   gem.add_runtime_dependency("tzinfo", [">= 1.0", "< 3.0"])
   gem.add_runtime_dependency("tzinfo-data", ["~> 1.0"])
   gem.add_runtime_dependency("strptime", [">= 0.2.4", "< 1.0.0"])
-  gem.add_runtime_dependency("webrick", [">= 1.4.2", "< 1.8.0"])
+  gem.add_runtime_dependency("webrick", ["~> 1.4"])
 
   # build gem for a certain platform. see also Rakefile
   fake_platform = ENV['GEM_BUILD_FAKE_PLATFORM'].to_s

data/lib/fluent/command/fluentd.rb

@@ -26,26 +26,27 @@ $fluentdargv = Marshal.load(Marshal.dump(ARGV))
 op = OptionParser.new
 op.version = Fluent::VERSION
 
-opts = Fluent::Supervisor.default_options
+default_opts = Fluent::Supervisor.default_options
+cmd_opts = {}
 
 op.on('-s', "--setup [DIR=#{File.dirname(Fluent::DEFAULT_CONFIG_PATH)}]", "install sample configuration file to the directory") {|s|
-  opts[:setup_path] = s || File.dirname(Fluent::DEFAULT_CONFIG_PATH)
+  cmd_opts[:setup_path] = s || File.dirname(Fluent::DEFAULT_CONFIG_PATH)
 }
 
 op.on('-c', '--config PATH', "config file path (default: #{Fluent::DEFAULT_CONFIG_PATH})") {|s|
-  opts[:config_path] = s
+  cmd_opts[:config_path] = s
 }
 
 op.on('--dry-run', "Check fluentd setup is correct or not", TrueClass) {|b|
-  opts[:dry_run] = b
+  cmd_opts[:dry_run] = b
 }
 
 op.on('--show-plugin-config=PLUGIN', "[DEPRECATED] Show PLUGIN configuration and exit(ex: input:dummy)") {|plugin|
-  opts[:show_plugin_config] = plugin
+  cmd_opts[:show_plugin_config] = plugin
 }
 
 op.on('-p', '--plugin DIR', "add plugin directory") {|s|
-  opts[:plugin_dirs] << s
+  (cmd_opts[:plugin_dirs] ||= []) << s
 }
 
 op.on('-I PATH', "add library path") {|s|
@@ -53,48 +54,48 @@ op.on('-I PATH', "add library path") {|s|
 }
 
 op.on('-r NAME', "load library") {|s|
-  opts[:libs] << s
+  (cmd_opts[:libs] ||= []) << s
 }
 
 op.on('-d', '--daemon PIDFILE', "daemonize fluent process") {|s|
-  opts[:daemonize] = s
+  cmd_opts[:daemonize] = s
 }
 
 op.on('--under-supervisor', "run fluent worker under supervisor (this option is NOT for users)") {
-  opts[:supervise] = false
+  cmd_opts[:supervise] = false
 }
 
 op.on('--no-supervisor', "run fluent worker without supervisor") {
-  opts[:supervise] = false
-  opts[:standalone_worker] = true
+  cmd_opts[:supervise] = false
+  cmd_opts[:standalone_worker] = true
 }
 
 op.on('--workers NUM', "specify the number of workers under supervisor") { |i|
-  opts[:workers] = i.to_i
+  cmd_opts[:workers] = i.to_i
 }
 
 op.on('--user USER', "change user") {|s|
-  opts[:chuser] = s
+  cmd_opts[:chuser] = s
 }
 
 op.on('--group GROUP', "change group") {|s|
-  opts[:chgroup] = s
+  cmd_opts[:chgroup] = s
 }
 
 op.on('--umask UMASK', "change umask") {|s|
-  opts[:chumask] = s
+  cmd_opts[:chumask] = s
 }
 
 op.on('-o', '--log PATH', "log file path") {|s|
-  opts[:log_path] = s
+  cmd_opts[:log_path] = s
 }
 
 op.on('--log-rotate-age AGE', 'generations to keep rotated log files') {|age|
   if Fluent::Log::LOG_ROTATE_AGE.include?(age)
-    opts[:log_rotate_age] = age
+    cmd_opts[:log_rotate_age] = age
   else
     begin
-      opts[:log_rotate_age] = Integer(age)
+      cmd_opts[:log_rotate_age] = Integer(age)
     rescue TypeError, ArgumentError
       usage "log-rotate-age should be #{ROTATE_AGE.join(', ')} or a number"
     end
@@ -102,129 +103,129 @@ op.on('--log-rotate-age AGE', 'generations to keep rotated log files') {|age|
 }
 
 op.on('--log-rotate-size BYTES', 'sets the byte size to rotate log files') {|s|
-  opts[:log_rotate_size] = s.to_i
+  cmd_opts[:log_rotate_size] = s.to_i
 }
 
 op.on('--log-event-verbose', 'enable log events during process startup/shutdown') {|b|
-  opts[:log_event_verbose] = b
+  cmd_opts[:log_event_verbose] = b
 }
 
 op.on('-i', '--inline-config CONFIG_STRING', "inline config which is appended to the config file on-the-fly") {|s|
-  opts[:inline_config] = s
+  cmd_opts[:inline_config] = s
 }
 
 op.on('--emit-error-log-interval SECONDS', "suppress interval seconds of emit error logs") {|s|
-  opts[:suppress_interval] = s.to_i
+  cmd_opts[:suppress_interval] = s.to_i
 }
 
 op.on('--suppress-repeated-stacktrace [VALUE]', "suppress repeated stacktrace", TrueClass) {|b|
   b = true if b.nil?
-  opts[:suppress_repeated_stacktrace] = b
+  cmd_opts[:suppress_repeated_stacktrace] = b
 }
 
 op.on('--without-source', "invoke a fluentd without input plugins", TrueClass) {|b|
-  opts[:without_source] = b
+  cmd_opts[:without_source] = b
 }
 
 op.on('--config-file-type VALU', 'guessing file type of fluentd configuration. yaml/yml or guess') { |s|
   if (s == 'yaml') || (s == 'yml')
-    opts[:config_file_type] = s.to_sym
+    cmd_opts[:config_file_type] = s.to_sym
   elsif (s == 'guess')
-    opts[:config_file_type] = s.to_sym
+    cmd_opts[:config_file_type] = s.to_sym
   else
     usage '--config-file-type accepts yaml/yml or guess'
   end
 }
 
 op.on('--use-v1-config', "Use v1 configuration format (default)", TrueClass) {|b|
-  opts[:use_v1_config] = b
+  cmd_opts[:use_v1_config] = b
 }
 
 op.on('--use-v0-config', "Use v0 configuration format", TrueClass) {|b|
-  opts[:use_v1_config] = !b
+  cmd_opts[:use_v1_config] = !b
 }
 
 op.on('--strict-config-value', "Parse config values strictly", TrueClass) {|b|
-  opts[:strict_config_value] = b
+  cmd_opts[:strict_config_value] = b
 }
 
 op.on('--enable-input-metrics', "Enable input plugin metrics on fluentd", TrueClass) {|b|
-  opts[:enable_input_metrics] = b
+  cmd_opts[:enable_input_metrics] = b
 }
 
 op.on('--enable-size-metrics', "Enable plugin record size metrics on fluentd", TrueClass) {|b|
-  opts[:enable_size_metrics] = b
+  cmd_opts[:enable_size_metrics] = b
 }
 
 op.on('-v', '--verbose', "increase verbose level (-v: debug, -vv: trace)", TrueClass) {|b|
-  if b
-    opts[:log_level] = [opts[:log_level] - 1, Fluent::Log::LEVEL_TRACE].max
-  end
+  return unless b
+  cur_level = cmd_opts.fetch(:log_level, default_opts[:log_level])
+  cmd_opts[:log_level] = [cur_level - 1, Fluent::Log::LEVEL_TRACE].max
 }
 
 op.on('-q', '--quiet', "decrease verbose level (-q: warn, -qq: error)", TrueClass) {|b|
-  if b
-    opts[:log_level] = [opts[:log_level] + 1, Fluent::Log::LEVEL_ERROR].min
-  end
+  return unless b
+  cur_level = cmd_opts.fetch(:log_level, default_opts[:log_level])
+  cmd_opts[:log_level] = [cur_level + 1, Fluent::Log::LEVEL_ERROR].min
 }
 
 op.on('--suppress-config-dump', "suppress config dumping when fluentd starts", TrueClass) {|b|
-  opts[:suppress_config_dump] = b
+  cmd_opts[:suppress_config_dump] = b
 }
 
 op.on('-g', '--gemfile GEMFILE', "Gemfile path") {|s|
-  opts[:gemfile] = s
+  cmd_opts[:gemfile] = s
 }
 
 op.on('-G', '--gem-path GEM_INSTALL_PATH', "Gemfile install path (default: $(dirname $gemfile)/vendor/bundle)") {|s|
-  opts[:gem_install_path] = s
+  cmd_opts[:gem_install_path] = s
 }
 
 op.on('--conf-encoding ENCODING', "specify configuration file encoding") { |s|
-  opts[:conf_encoding] = s
+  cmd_opts[:conf_encoding] = s
 }
 
 op.on('--disable-shared-socket', "Don't open shared socket for multiple workers") { |b|
-  opts[:disable_shared_socket] = b
+  cmd_opts[:disable_shared_socket] = b
 }
 
 if Fluent.windows?
-  opts.merge!(
+  cmd_opts.merge!(
     :winsvc_name => 'fluentdwinsvc',
     :winsvc_display_name => 'Fluentd Windows Service',
     :winsvc_desc => 'Fluentd is an event collector system.',
   )
 
   op.on('-x', '--signame INTSIGNAME', "an object name which is used for Windows Service signal (Windows only)") {|s|
-    opts[:signame] = s
+    cmd_opts[:signame] = s
   }
 
   op.on('--reg-winsvc MODE', "install/uninstall as Windows Service. (i: install, u: uninstall) (Windows only)") {|s|
-    opts[:regwinsvc] = s
+    cmd_opts[:regwinsvc] = s
   }
 
   op.on('--[no-]reg-winsvc-auto-start', "Automatically start the Windows Service at boot. (only effective with '--reg-winsvc i') (Windows only)") {|s|
-    opts[:regwinsvcautostart] = s
+    cmd_opts[:regwinsvcautostart] = s
   }
 
   op.on('--[no-]reg-winsvc-delay-start', "Automatically start the Windows Service at boot with delay. (only effective with '--reg-winsvc i' and '--reg-winsvc-auto-start') (Windows only)") {|s|
-    opts[:regwinsvcdelaystart] = s
+    cmd_opts[:regwinsvcdelaystart] = s
   }
 
   op.on('--reg-winsvc-fluentdopt OPTION', "specify fluentd option parameters for Windows Service. (Windows only)") {|s|
-    opts[:fluentdopt] = s
+    cmd_opts[:fluentdopt] = s
   }
 
   op.on('--winsvc-name NAME', "The Windows Service name to run as (Windows only)") {|s|
-    opts[:winsvc_name] = s
+    cmd_opts[:winsvc_name] = s
   }
 
   op.on('--winsvc-display-name DISPLAY_NAME', "The Windows Service display name (Windows only)") {|s|
-    opts[:winsvc_display_name] = s
+    cmd_opts[:winsvc_display_name] = s
   }
 
   op.on('--winsvc-desc DESC', "The Windows Service description (Windows only)") {|s|
-    opts[:winsvc_desc] = s
+    cmd_opts[:winsvc_desc] = s
   }
 end
 
@@ -247,6 +248,7 @@ rescue
   usage $!.to_s
 end
 
+opts = default_opts.merge(cmd_opts)
 
 ##
 ## Bundler injection
@@ -345,7 +347,7 @@ end
 exit 0 if early_exit
 
 if opts[:supervise]
-  supervisor = Fluent::Supervisor.new(opts)
+  supervisor = Fluent::Supervisor.new(cmd_opts)
   supervisor.configure(supervisor: true)
   supervisor.run_supervisor(dry_run: opts[:dry_run])
 else
@@ -353,7 +355,7 @@ else
     puts "Error: multi workers is not supported with --no-supervisor"
     exit 2
   end
-  worker = Fluent::Supervisor.new(opts)
+  worker = Fluent::Supervisor.new(cmd_opts)
   worker.configure
 
   if opts[:daemonize] && opts[:standalone_worker]

data/lib/fluent/daemon.rb

@@ -9,7 +9,5 @@ require 'fluent/supervisor'
 
 server_module = Fluent.const_get(ARGV[0])
 worker_module = Fluent.const_get(ARGV[1])
-# it doesn't call ARGV in block because when reloading config, params will be initialized and then it can't use previous config.
-config_path = ARGV[2]
-params = JSON.parse(ARGV[3])
-ServerEngine::Daemon.run_server(server_module, worker_module) { Fluent::Supervisor.load_config(config_path, params) }
+params = JSON.parse(ARGV[2])
+ServerEngine::Daemon.run_server(server_module, worker_module) { Fluent::Supervisor.serverengine_config(params) }

data/lib/fluent/log/console_adapter.rb

@@ -0,0 +1,66 @@
+#
+# Fluentd
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+require 'console/terminal/logger'
+
+module Fluent
+  class Log
+    # Async gem which is used by http_server helper switched logger mechanism to
+    # Console gem which isn't complatible with Ruby's standard Logger (since
+    # v1.17). This class adapts it to Fluentd's logger mechanism.
+    class ConsoleAdapter < Console::Terminal::Logger
+      def self.wrap(logger)
+        _, level = Console::Logger::LEVELS.find { |key, value|
+          if logger.level <= 0
+            key == :debug
+          else
+            value == logger.level - 1
+          end
+        }
+        Console::Logger.new(ConsoleAdapter.new(logger), level: level)
+      end
+
+      def initialize(logger)
+        @logger = logger
+        # When `verbose` is `true`, following items will be added as a prefix or
+        # suffix of the subject:
+        #   * Severity
+        #   * Object ID
+        #   * PID
+        #   * Time
+        # Severity and Time are added by Fluentd::Log too so they are redundant.
+        # PID is the worker's PID so it's also redundant.
+        # Object ID will be too verbose in usual cases.
+        # So set it as `false` here to suppress redundant items.
+        super(StringIO.new, verbose: false)
+      end
+
+      def call(subject = nil, *arguments, name: nil, severity: 'info', **options, &block)
+        if LEVEL_TEXT.include?(severity.to_s)
+          level = severity
+        else
+          @logger.warn("Unknown severity: #{severity}")
+          level = 'warn'
+        end
+
+        @io.seek(0)
+        @io.truncate(0)
+        super
+        @logger.send(level, @io.string.chomp)
+      end
+    end
+  end
+end

data/lib/fluent/log.rb

@@ -67,8 +67,29 @@ module Fluent
       LEVEL_TEXT.map{|t| "#{LOG_EVENT_TAG_PREFIX}.#{t}" }
     end
 
+    # Create a unique path for each process.
+    #
+    # >>> per_process_path("C:/tmp/test.log", :worker, 1)
+    # C:/tmp/test-1.log
+    # >>> per_process_path("C:/tmp/test.log", :supervisor, 0)
+    # C:/tmp/test-supervisor-0.log
+    def self.per_process_path(path, process_type, worker_id)
+      path = Pathname(path)
+      ext = path.extname
+
+      if process_type == :supervisor
+        suffix = "-#{process_type}-0#{ext}"  # "-0" for backword compatibility.
+      else
+        suffix = "-#{worker_id}#{ext}"
+      end
+      return path.sub_ext(suffix).to_s
+    end
+
     def initialize(logger, opts={})
-      # overwrites logger.level= so that config reloading resets level of Fluentd::Log
+      # When ServerEngine changes the logger.level, the Fluentd logger level should also change.
+      # So overwrites logger.level= below.
+      # However, currently Fluentd doesn't use the ServerEngine's reloading feature,
+      # so maybe we don't need this overwriting anymore.
       orig_logger_level_setter = logger.class.public_instance_method(:level=).bind(logger)
       me = self
       # The original ruby logger sets the number as each log level like below.
@@ -92,6 +113,7 @@ module Fluent
       # So if serverengine's logger level is changed, fluentd's log level will be changed to that + 1.
       logger.define_singleton_method(:level=) {|level| orig_logger_level_setter.call(level); me.level = self.level + 1 }
 
+      @path = opts[:path]
       @logger = logger
       @out = logger.instance_variable_get(:@logdev)
       @level = logger.level + 1
@@ -102,7 +124,8 @@ module Fluent
       @time_format = nil
       @formatter = nil
 
-      self.format = :text
+      self.format = opts.fetch(:format, :text)
+      self.time_format = opts[:time_format] if opts.key?(:time_format)
       enable_color out.tty?
       # TODO: This variable name is unclear so we should change to better name.
       @threads_exclude_events = []
@@ -154,8 +177,12 @@ module Fluent
 
     attr_reader :format
     attr_reader :time_format
-    attr_accessor :log_event_enabled, :ignore_repeated_log_interval, :ignore_same_log_interval
+    attr_accessor :log_event_enabled, :ignore_repeated_log_interval, :ignore_same_log_interval, :suppress_repeated_stacktrace
     attr_accessor :out
+    # Strictly speaking, we should also change @logger.level when the setter of @level is called.
+    # Currently, we don't need to do it, since Fluentd::Log doesn't use ServerEngine::DaemonLogger.level.
+    # Since We overwrites logger.level= so that @logger.level is applied to @level,
+    # we need to find a good way to do this, otherwise we will end up in an endless loop.
     attr_accessor :level
     attr_accessor :optional_header, :optional_attrs
 
@@ -202,9 +229,12 @@ module Fluent
       @time_formatter = Strftime.new(@time_format) rescue nil
     end
 
+    def stdout?
+      @out == $stdout
+    end
+
     def reopen!
-      # do nothing in @logger.reopen! because it's already reopened in Supervisor.load_config
-      @logger.reopen! if @logger
+      @out.reopen(@path, "a") if @path && @path != "-"
       nil
     end
 

data/lib/fluent/plugin/base.rb

@@ -53,14 +53,12 @@ module Fluent
       end
 
       def configure(conf)
-        if Fluent::Engine.supervisor_mode || (conf.respond_to?(:for_this_worker?) && conf.for_this_worker?)
-          workers = if conf.target_worker_ids && !conf.target_worker_ids.empty?
-                      conf.target_worker_ids.size
-                    else
-                      1
-                    end
-          system_config_override(workers: workers)
+        raise ArgumentError, "BUG: type of conf must be Fluent::Config::Element, but #{conf.class} is passed." unless conf.is_a?(Fluent::Config::Element)
+
+        if conf.for_this_worker? || (Fluent::Engine.supervisor_mode && !conf.for_every_workers?)
+          system_config_override(workers: conf.target_worker_ids.size)
         end
+
         super(conf, system_config.strict_config_value)
         @_state ||= State.new(false, false, false, false, false, false, false, false, false)
         @_state.configure = true