fluentd 0.14.13-x86-mingw32 → 0.14.17-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb1ab0a5960405e7a2176864cef9d4675317cb41
-  data.tar.gz: 40db95764d94a4872b3e7215920a4a594e637e37
+  metadata.gz: 89a9538ae8144bcf7882b926abd6fb4a43cbe350
+  data.tar.gz: 2db2921952b092358553c8d16320f57d14659cc1
 SHA512:
-  metadata.gz: f98b6d6f4654c053b76a15651184ee289d7e631a21e25a451a05a40f893876ba3b03094ce057343e66e0c41b4e1115710e5d4fca7c1d5f32bc65fb3bef8c83c3
-  data.tar.gz: 634367c59d871aa3fc114241b3d1d8de8e3f6689560de9dce628d7eac6d15a6f3691c3bd1aa53145dab2a071bb3175a0a3366704dc4782724efcb8cf5ff1bdd9
+  metadata.gz: 148b86d6cf730aca90c89e39bfa64aa170525349b86f9d3d14c7008522bec8326025b52dcaa0e18cc179c9733b84d0a19c8106ea3eabd1f299b020b6ad829d2c
+  data.tar.gz: 391366d75b22167f3a3ecc4208489c4d3b614052e7ad2b6e889588c2eb69c8d7657306aa2f5c57f3c2d86f639f9164a0f50b6c88ca59fd55a1987ff3831e453e

data/.travis.yml

@@ -13,13 +13,13 @@ matrix:
       os: linux
     - rvm: 2.3.3
       os: linux
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       os: linux
     - rvm: ruby-head
       os: linux
     - rvm: 2.1.10
       os: osx
-      osx_image: xcode8.2 # OSX 10.12
+      osx_image: xcode8.3 # OSX 10.12
     # - rvm: 2.2.6
     #   os: osx
     #   osx_image: xcode8.2 # OSX 10.12
@@ -28,17 +28,16 @@ matrix:
     #   osx_image: xcode8.2 # OSX 10.12
     - rvm: 2.4.0
       os: osx
-      osx_image: xcode8.2 # OSX 10.12
+      osx_image: xcode8.3 # OSX 10.12
     - rvm: ruby-head
       os: osx
-      osx_image: xcode 8.2 # OSX 10.12
+      osx_image: xcode 8.3 # OSX 10.12
   allow_failures:
     - rvm: ruby-head
 
 branches:
   only:
     - master
-    - v0.10
     - v0.12
     - v0.14
 

data/ChangeLog

@@ -1,5 +1,111 @@
 # v0.14
 
+## Release v0.14.17 - 2017/05/29
+
+### New features / Enhancements
+
+* in_tail: Add ignore_repeated_permission_error
+  https://github.com/fluent/fluentd/pull/1574
+* server: Accept private key for TLS server without passphrase
+  https://github.com/fluent/fluentd/pull/1575
+* config: Validate workers option on standalone mode
+  https://github.com/fluent/fluentd/pull/1577
+
+### Bug fixes
+
+* config: Mask all secret parameters in worker section
+  https://github.com/fluent/fluentd/pull/1580
+* out_forward: Fix ack handling
+  https://github.com/fluent/fluentd/pull/1581
+* plugin-config-format: Fix markdown format generator
+  https://github.com/fluent/fluentd/pull/1585
+
+## Release v0.14.16 - 2017/05/13
+
+### New features / Enhancements
+
+* config: Allow null byte in double-quoted string
+  https://github.com/fluent/fluentd/pull/1552
+* parser: Support %iso8601 special case for time_format
+  https://github.com/fluent/fluentd/pull/1562
+
+### Bug fixes
+
+* out_forward: Call proper method for each connection type
+  https://github.com/fluent/fluentd/pull/1560
+* in_monitor_agent: check variable buffer is a Buffer instance
+  https://github.com/fluent/fluentd/pull/1556
+* log: Add missing '<<' method to delegators
+  https://github.com/fluent/fluentd/pull/1558
+* command: uninitialized constant Fluent::Engine in fluent-binlog-reader
+  https://github.com/fluent/fluentd/pull/1568
+
+## Release v0.14.15 - 2017/04/23
+
+### New features / Enhancements
+
+* Add <worker N> directive
+  https://github.com/fluent/fluentd/pull/1507
+* in_tail: Do not warn that directories are unreadable in the in_tail plugin
+  https://github.com/fluent/fluentd/pull/1540
+* output: Add formatted_to_msgpack_binary? to Output plugin API
+  https://github.com/fluent/fluentd/pull/1547
+* windows: Allow the Windows Service name Fluentd runs as to be configurable
+  https://github.com/fluent/fluentd/pull/1548
+
+### Bug fixes
+
+* in_http: Fix X-Forwarded-For header handling. Accpet multiple headers
+  https://github.com/fluent/fluentd/pull/1535
+* Fix backward compatibility with Fluent::DetachProcess and Fluent::DetachMultiProcess
+  https://github.com/fluent/fluentd/pull/1522
+* fix typo
+  https://github.com/fluent/fluentd/pull/1521
+  https://github.com/fluent/fluentd/pull/1523
+  https://github.com/fluent/fluentd/pull/1544
+* test: Fix out_file test with timezone
+  https://github.com/fluent/fluentd/pull/1546
+* windows: Quote the file path to the Ruby bin directory when starting fluentd as a windows service
+  https://github.com/fluent/fluentd/pull/1536
+
+## Release v0.14.14 - 2017/03/23
+
+### New features / Enhancements
+
+* in_http: Support 'application/msgpack` header
+  https://github.com/fluent/fluentd/pull/1498
+* in_udp: Add message_length_limit parameter for parameter name consistency with in_syslog
+  https://github.com/fluent/fluentd/pull/1515
+* in_monitor_agent: Start one HTTP server per worker on sequential port numbers
+  https://github.com/fluent/fluentd/pull/1493
+* in_tail: Skip the refresh of watching list on startup
+  https://github.com/fluent/fluentd/pull/1487
+* filter_parser: filter_parser: Add emit_invalid_record_to_error parameter
+  https://github.com/fluent/fluentd/pull/1494
+* parser_syslog: Support RFC5424 syslog format
+  https://github.com/fluent/fluentd/pull/1492
+* parser: Allow escape sequence in Apache access log
+  https://github.com/fluent/fluentd/pull/1479
+* config: Add actual value in the placholder error message
+  https://github.com/fluent/fluentd/pull/1497
+* log: Add Fluent::Log#<< to support some SDKs
+  https://github.com/fluent/fluentd/pull/1478
+
+### Bug fixes
+
+* Fix cleanup resource
+  https://github.com/fluent/fluentd/pull/1483
+* config: Set encoding forcefully to avoid UndefinedConversionError
+  https://github.com/fluent/fluentd/pull/1477
+* Fix Input and Output deadlock when buffer is full during startup
+  https://github.com/fluent/fluentd/pull/1502
+* config: Fix log_level handling in <system>
+  https://github.com/fluent/fluentd/pull/1501
+* Fix typo in root agent error log
+  https://github.com/fluent/fluentd/pull/1491
+* storage: Fix a bug storage_create cannot accept hash as `conf` keyword argument
+  https://github.com/fluent/fluentd/pull/1482
+
 ## Release v0.14.13 - 2017/02/17
 
 ### New features / Enhancements

data/MAINTAINERS.md

@@ -0,0 +1,5 @@
+- Sadayuki Furuhashi <frsyuki@gmail.com>
+- Masahiro Nakagawa <repeatedly@gmail.com>
+- Kiyoto Tamura <me@ktamura.com>
+- Kazuki Ohta <kazuki.ohta@gmail.com>
+- Satoshi "Moris" Tagomori <tagomoris@gmail.com>

data/README.md

@@ -26,6 +26,31 @@ Mobile/Web Application Logging | Fluentd can function as middleware to enable as
     $ fluentd -c conf/fluent.conf &
     $ echo '{"json":"message"}' | fluent-cat debug.test
 
+## Development
+
+### Prerequisites
+
+- Ruby 2.1 or later
+- git
+
+`git` should be in `PATH`. On Windows, you can use `Github for Windows` and `GitShell` for easy setup.
+
+### Install dependent gems
+
+Use bundler:
+
+    $ gem install bundler
+    $ bundle install --path vendor/bundle
+
+### Run test
+
+    $ bundle exec rake test
+
+You can run specified test via `TEST` environment variable:
+
+    $ bundle exec rake test TEST=test/test_specified_path.rb
+    $ bundle exec rake test TEST=test/test_*.rb
+
 ## Fluentd UI: Admin GUI
 
 [Fluentd UI](https://github.com/fluent/fluentd-ui) is a graphical user interface to start/stop/configure Fluentd.

data/example/worker_section.conf

@@ -0,0 +1,36 @@
+<system>
+  workers 4
+  root_dir /path/fluentd/root
+</system>
+
+<source> # top-level sections works on all workers in parallel
+  @type forward
+  port 24224
+</source>
+
+<match all> # this sections also works on all workers in parallel
+  @type stdout
+  <inject>
+    worker_id_key worker_id
+  </inject>
+</match>
+
+<worker 0> # this section works only on first worker process
+  <source>
+    @type tail
+    format none
+    path /var/log/fluentd_test.log
+    pos_file /var/log/fluentd_test.pos
+    tag tail
+    rotate_wait 5
+    read_from_head true
+    refresh_interval 60
+  </source>
+
+  <match tail>
+    @type stdout
+    <inject>
+      worker_id_key worker_id
+    </inject>
+  </match>
+</worker>

data/fluentd.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency("msgpack", [">= 0.7.0", "< 2.0.0"])
   gem.add_runtime_dependency("yajl-ruby", ["~> 1.0"])
-  gem.add_runtime_dependency("cool.io", ["~> 1.4.5"])
+  gem.add_runtime_dependency("cool.io", [">= 1.4.5", "< 2.0.0"])
   gem.add_runtime_dependency("serverengine", [">= 2.0.4", "< 3.0.0"])
   gem.add_runtime_dependency("http_parser.rb", [">= 0.5.1", "< 0.7.0"])
   gem.add_runtime_dependency("sigdump", ["~> 0.2.2"])

data/lib/fluent/agent.rb

@@ -62,6 +62,7 @@ module Fluent
 
       # initialize <match> and <filter> elements
       conf.elements('filter', 'match').each { |e|
+        next if e.for_another_worker?
         pattern = e.arg.empty? ? '**' : e.arg
         type = e['@type']
         raise ConfigError, "Missing '@type' parameter on <#{e.name}> directive" unless type
@@ -121,7 +122,8 @@ module Fluent
     end
 
     def add_match(type, pattern, conf)
-      log.info :worker0, "adding match#{@context.nil? ? '' : " in #{@context}"}", pattern: pattern, type: type
+      log_type = conf.for_this_worker? ? :default : :worker0
+      log.info log_type, "adding match#{@context.nil? ? '' : " in #{@context}"}", pattern: pattern, type: type
 
       output = Plugin.new_output(type)
       output.context_router = @event_router
@@ -142,7 +144,8 @@ module Fluent
     end
 
     def add_filter(type, pattern, conf)
-      log.info :worker0, "adding filter#{@context.nil? ? '' : " in #{@context}"}", pattern: pattern, type: type
+      log_type = conf.for_this_worker? ? :default : :worker0
+      log.info log_type, "adding filter#{@context.nil? ? '' : " in #{@context}"}", pattern: pattern, type: type
 
       filter = Plugin.new_filter(type)
       filter.context_router = @event_router

data/lib/fluent/command/binlog_reader.rb

@@ -21,6 +21,7 @@ require 'fluent/msgpack_factory'
 require 'fluent/formatter'
 require 'fluent/plugin'
 require 'fluent/config/element'
+require 'fluent/engine'
 
 class FluentBinlogReader
   SUBCOMMAND = %w(cat head formats)

data/lib/fluent/command/fluentd.rb

@@ -158,6 +158,12 @@ op.on('-G', '--gem-path GEM_INSTALL_PATH', "Gemfile install path (default: $(dir
 if Fluent.windows?
   require 'windows/library'
   include Windows::Library
+  
+  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
@@ -174,6 +180,18 @@ if Fluent.windows?
   op.on('--reg-winsvc-fluentdopt OPTION', "specify fluentd option paramters for Windows Service. (Windows only)") {|s|
     opts[:fluentdopt] = s
   }
+  
+  op.on('--winsvc-name NAME', "The Windows Service name to run as (Windows only)") {|s|
+    opts[:winsvc_name] = s
+  }
+  
+  op.on('--winsvc-display-name DISPLAY_NAME', "The Windows Service display name (Windows only)") {|s|
+    opts[:winsvc_display_name] = s
+  }
+  
+  op.on('--winsvc-desc DESC', "The Windows Service description (Windows only)") {|s|
+    opts[:winsvc_desc] = s
+  }
 end
 
 
@@ -229,9 +247,6 @@ end
 early_exit = false
 start_service = false
 if winsvcinstmode = opts[:regwinsvc]
-  FLUENTD_WINSVC_NAME="fluentdwinsvc"
-  FLUENTD_WINSVC_DISPLAYNAME="Fluentd Windows Service"
-  FLUENTD_WINSVC_DESC="Fluentd is an event collector system."
   require 'fileutils'
   require "win32/service"
   require "win32/registry"
@@ -249,27 +264,28 @@ if winsvcinstmode = opts[:regwinsvc]
       start_service = true
     end
 
+    
     Service.create(
-      service_name: FLUENTD_WINSVC_NAME,
+      service_name: opts[:winsvc_name],
       host: nil,
       service_type: Service::WIN32_OWN_PROCESS,
-      description: FLUENTD_WINSVC_DESC,
+      description: opts[:winsvc_desc],
       start_type: start_type,
       error_control: Service::ERROR_NORMAL,
-      binary_path_name: ruby_path+" -C "+binary_path+" winsvc.rb",
+      binary_path_name: "\"#{ruby_path}\" -C \"#{binary_path}\"  winsvc.rb --service-name #{opts[:winsvc_name]}",
       load_order_group: "",
       dependencies: [""],
-      display_name: FLUENTD_WINSVC_DISPLAYNAME
+      display_name: opts[:winsvc_display_name]
     )
   when 'u'
-    if Service.status(FLUENTD_WINSVC_NAME).current_state != 'stopped'
+    if Service.status(opts[:winsvc_name]).current_state != 'stopped'
       begin
-        Service.stop(FLUENTD_WINSVC_NAME)
+        Service.stop(opts[:winsvc_name])
       rescue => ex
         puts "Warning: Failed to stop service: ", ex
       end
     end
-    Service.delete(FLUENTD_WINSVC_NAME)
+    Service.delete(opts[:winsvc_name])
   else
     # none
   end
@@ -277,14 +293,14 @@ if winsvcinstmode = opts[:regwinsvc]
 end
 
 if fluentdopt = opts[:fluentdopt]
-  Win32::Registry::HKEY_LOCAL_MACHINE.open("SYSTEM\\CurrentControlSet\\Services\\fluentdwinsvc", Win32::Registry::KEY_ALL_ACCESS) do |reg|
+  Win32::Registry::HKEY_LOCAL_MACHINE.open("SYSTEM\\CurrentControlSet\\Services\\#{opts[:winsvc_name]}", Win32::Registry::KEY_ALL_ACCESS) do |reg|
     reg['fluentdopt', Win32::Registry::REG_SZ] = fluentdopt
   end
   early_exit = true
 end
 
 if start_service
-  Service.start(FLUENTD_WINSVC_NAME)
+  Service.start(opts[:winsvc_name])
 end
 
 exit 0 if early_exit

data/lib/fluent/command/plugin_config_formatter.rb

@@ -167,7 +167,6 @@ class FluentPluginConfigFormatter
       required = sub_section.delete(:required)
       multi = sub_section.delete(:multi)
       alias_name = sub_section.delete(:alias)
-      $log.trace(name: section_name, required: required, multi: multi, alias_name: alias_name)
       sub_section.delete(:section)
       dumped << ERB.new(template_path("section.md.erb").read, nil, "-").result(binding)
     end

data/lib/fluent/command/plugin_generator.rb

@@ -227,7 +227,7 @@ BANNER
 \tY - yes, overwrite
 \tn - no, do not overwrite
 \ta - all, overwrite this and all others
-\tq - quite, abort
+\tq - quit, abort
 \th - help, show this help
 HELP
       end

data/lib/fluent/compat/detach_process_mixin.rb

@@ -17,9 +17,17 @@
 module Fluent
   module Compat
     module DetachProcessMixin
+      def detach_process
+        log.warn "#{__method__} is not supported in this version. ignored."
+        yield
+      end
     end
 
     module DetachMultiProcessMixin
+      def detach_multi_process
+        log.warn "#{__method__} is not supported in this version. ignored."
+        yield
+      end
     end
   end
 end

data/lib/fluent/compat/input.rb

@@ -44,16 +44,6 @@ module Fluent
       def shutdown
         super
       end
-
-      def detach_process(&block)
-        log.warn "detach_process is not supported in this version. ignored."
-        block.call
-      end
-
-      def detach_multi_process(&block)
-        log.warn "detach_process is not supported in this version. ignored."
-        block.call
-      end
     end
   end
 end

data/lib/fluent/compat/output.rb

@@ -190,16 +190,6 @@ module Fluent
           end
         end
       end
-
-      def detach_process(&block)
-        log.warn "detach_process is not supported in this version. ignored."
-        block.call
-      end
-
-      def detach_multi_process(&block)
-        log.warn "detach_process is not supported in this version. ignored."
-        block.call
-      end
     end
 
     class MultiOutput < Fluent::Plugin::BareOutput