fluentd 0.14.23 → 0.14.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 295a3c8dbe521b90ed22fcbc07ed1934d77325ad
-  data.tar.gz: 57bcb6c43a76065fc9b3fd681a83f3a4aa2c0eae
+  metadata.gz: 3b8e3c3ad160e7b55045cc90693e4ed49e32e4d2
+  data.tar.gz: 0e0d26c585d8f9bd617050ce04936dc8a2d38095
 SHA512:
-  metadata.gz: ff0029c699dbe57532351805e5d2cd4bc0d65d1635219b18eeddb019b1ff8845b71ac1029367024765b48f2971fa4f999fd7fa361329ecc4394b806651b539f4
-  data.tar.gz: d7cb461f8f6cf8d65e088e1ea2db7aed60387280ac7b95c15b0220ee5e527f947cc0cecd9541162a81960f9dbce2393f26eddf4239745270763a59ad7303dbae
+  metadata.gz: 2a1790cd33c2c41176dd0452d918b979d21a5e7ac32f7730ad91d9b8c62404c095303d90f39bf69ea11dfac193bf733613e6926fc1aa7a73d8f6941f71c94bdb
+  data.tar.gz: 254bedd1088b57682cdbe0df7f547cad567702b6872d334c6cc82eb9d95c85f95a6c7537850bc0668a653ce73e4d69093861c482c45f459e9e49490a657521d7

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # v0.14
 
+## Release v0.14.24 - 2017/11/24
+
+### New features / Enhancements
+
+* plugin-config-formatter: Add link to plugin helper result
+  https://github.com/fluent/fluentd/pull/1753
+* server helper: Refactor code
+  https://github.com/fluent/fluentd/pull/1759
+
+### Bug fixes
+
+* supervisor: Don't call change_privilege twice
+  https://github.com/fluent/fluentd/pull/1757
+
 ## Release v0.14.23 - 2017/11/15
 
 ### New features / Enhancements

data/lib/fluent/command/cat.rb

@@ -73,7 +73,7 @@ op.on('--time-as-integer', "Send time as integer for v0.12 or earlier", TrueClas
   time_as_integer = true
 }
 
-(class << self; self; end).module_eval do
+singleton_class.module_eval do
   define_method(:usage) do |msg|
     puts op.to_s
     puts "error: #{msg}" if msg

data/lib/fluent/command/debug.rb

@@ -34,7 +34,7 @@ op.on('-u', '--unix PATH', "use unix socket instead of tcp") {|b|
   unix = b
 }
 
-(class << self; self; end).module_eval do
+singleton_class.module_eval do
   define_method(:usage) do |msg|
     puts op.to_s
     puts "error: #{msg}" if msg

data/lib/fluent/command/fluentd.rb

@@ -195,7 +195,7 @@ if Fluent.windows?
 end
 
 
-(class << self; self; end).module_eval do
+singleton_class.module_eval do
   define_method(:usage) do |msg|
     puts op.to_s
     puts "error: #{msg}" if msg

data/lib/fluent/command/plugin_config_formatter.rb

@@ -31,6 +31,8 @@ class FluentPluginConfigFormatter
     "buffer", "parser", "formatter", "storage"
   ]
 
+  DOCS_BASE_URL = "https://docs.fluentd.org/v0.14/articles/"
+
   def initialize(argv = ARGV)
     @argv = argv
 
@@ -134,7 +136,7 @@ class FluentPluginConfigFormatter
     if plugin_helpers && !plugin_helpers.empty?
       dumped = "## Plugin helpers\n\n"
       plugin_helpers.each do |plugin_helper|
-        dumped << "* #{plugin_helper}\n"
+        dumped << "* #{plugin_helper_markdown_link(plugin_helper)}\n"
       end
       dumped << "\n"
     end
@@ -143,7 +145,7 @@ class FluentPluginConfigFormatter
         dumped << "## #{name}\n\n"
         dumped << dump_section_markdown(config)
       else
-        dumped << "* See also: #{name}\n\n"
+        dumped << "* See also: #{plugin_overview_markdown_link(name)}\n\n"
       end
     end
     dumped
@@ -181,6 +183,24 @@ class FluentPluginConfigFormatter
     end
   end
 
+  def plugin_helper_url(plugin_helper)
+    "#{DOCS_BASE_URL}api-plugin-helper-#{plugin_helper}"
+  end
+
+  def plugin_helper_markdown_link(plugin_helper)
+    "[#{plugin_helper}](#{plugin_helper_url(plugin_helper)})"
+  end
+
+  def plugin_overview_url(class_name)
+    plugin_type = class_name.slice(/::(\w+)\z/, 1).downcase
+    "#{DOCS_BASE_URL}#{plugin_type}-plugin-overview"
+  end
+
+  def plugin_overview_markdown_link(class_name)
+    plugin_type = class_name.slice(/::(\w+)\z/, 1)
+    "[#{plugin_type} Plugin Overview](#{plugin_overview_url(class_name)})"
+  end
+
   def usage(message = nil)
     puts @parser.to_s
     puts

data/lib/fluent/plugin/in_syslog.rb

@@ -156,8 +156,8 @@ module Fluent::Plugin
       delimiter = "\n"
       delimiter_size = delimiter.size
       server_create_connection(:in_syslog_tcp_server, @port, bind: @bind, resolve_name: @resolve_hostname) do |conn|
-        buffer = ""
         conn.data do |data|
+          buffer = conn.buffer
           buffer << data
           pos = 0
           while idx = buffer.index(delimiter, pos)

data/lib/fluent/plugin/in_unix.rb

@@ -146,7 +146,7 @@ module Fluent
           @u = Fluent::Engine.msgpack_factory.unpacker
         end
 
-        (class << self; self; end).module_eval do
+        singleton_class.module_eval do
           define_method(:on_read, m)
         end
         m.call(data)

data/lib/fluent/plugin/output.rb

@@ -224,7 +224,7 @@ module Fluent
         end
         self.context_router = primary.context_router
 
-        (class << self; self; end).module_eval do
+        singleton_class.module_eval do
           define_method(:commit_write){ |chunk_id| @primary_instance.commit_write(chunk_id, delayed: delayed_commit, secondary: true) }
           define_method(:rollback_write){ |chunk_id| @primary_instance.rollback_write(chunk_id) }
         end
@@ -389,7 +389,7 @@ module Fluent
 
         if @buffering
           m = method(:emit_buffered)
-          (class << self; self; end).module_eval do
+          singleton_class.module_eval do
             define_method(:emit_events, m)
           end
 
@@ -403,7 +403,7 @@ module Fluent
           @delayed_commit_timeout = @buffer_config.delayed_commit_timeout
         else # !@buffering
           m = method(:emit_sync)
-          (class << self; self; end).module_eval do
+          singleton_class.module_eval do
             define_method(:emit_events, m)
           end
         end

data/lib/fluent/plugin_helper/record_accessor.rb

@@ -37,7 +37,7 @@ module Fluent
 
           # Call [] for single key to reduce dig overhead
           m = method(@keys.is_a?(Array) ? :call_dig : :call_index)
-          (class << self; self; end).module_eval do
+          singleton_class.module_eval do
             define_method(:call, m)
           end
         end

data/lib/fluent/plugin_helper/server.rb

@@ -370,6 +370,9 @@ module Fluent
         sock
       end
 
+      # Use string "?" for port, not integer or nil. "?" is clear than -1 or nil in the log.
+      PEERADDR_FAILED = ["?", "?", "name resolusion failed", "?"]
+
       class CallbackSocket
         def initialize(server_type, sock, enabled_events = [], close_socket: true)
           @server_type = server_type
@@ -425,11 +428,13 @@ module Fluent
       end
 
       class TCPCallbackSocket < CallbackSocket
+        ENABLED_EVENTS = [:data, :write_complete, :close]
+
         attr_accessor :buffer
 
         def initialize(sock)
-          super("tcp", sock, [:data, :write_complete, :close])
-          @peeraddr = @sock.peeraddr
+          super("tcp", sock, ENABLED_EVENTS)
+          @peeraddr = (@sock.peeraddr rescue PEERADDR_FAILED)
           @buffer = ''
         end
 
@@ -439,9 +444,11 @@ module Fluent
       end
 
       class TLSCallbackSocket < CallbackSocket
+        ENABLED_EVENTS = [:data, :write_complete, :close]
+
         def initialize(sock)
-          super("tls", sock, [:data, :write_complete, :close])
-          @peeraddr = @sock.to_io.peeraddr
+          super("tls", sock, ENABLED_EVENTS)
+          @peeraddr = (@sock.to_io.peeraddr rescue PEERADDR_FAILED)
         end
 
         def write(data)
@@ -450,8 +457,10 @@ module Fluent
       end
 
       class UDPCallbackSocket < CallbackSocket
+        ENABLED_EVENTS = []
+
         def initialize(sock, peeraddr, **kwargs)
-          super("udp", sock, [], **kwargs)
+          super("udp", sock, ENABLED_EVENTS, **kwargs)
           @peeraddr = peeraddr
         end
 

data/lib/fluent/supervisor.rb

@@ -517,7 +517,7 @@ module Fluent
 
       main_process do
         create_socket_manager if @standalone_worker
-        change_privilege
+        change_privilege if @standalone_worker
         init_engine
         run_configure
         run_engine

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.14.23'
+  VERSION = '0.14.24'
 
 end

data/test/command/test_plugin_config_formatter.rb

@@ -179,10 +179,10 @@ TEXT
       expected = <<TEXT
 ## Plugin helpers
 
-* inject
-* compat_parameters
+* [inject](https://docs.fluentd.org/v0.14/articles/api-plugin-helper-inject)
+* [compat_parameters](https://docs.fluentd.org/v0.14/articles/api-plugin-helper-compat_parameters)
 
-* See also: Fluent::Plugin::Input
+* See also: [Input Plugin Overview](https://docs.fluentd.org/v0.14/articles/input-plugin-overview)
 
 ## TestFluentPluginConfigFormatter::SimpleInput
 
@@ -202,10 +202,10 @@ TEXT
       expected = <<TEXT
 ## Plugin helpers
 
-* inject
-* compat_parameters
+* [inject](https://docs.fluentd.org/v0.14/articles/api-plugin-helper-inject)
+* [compat_parameters](https://docs.fluentd.org/v0.14/articles/api-plugin-helper-compat_parameters)
 
-* See also: Fluent::Plugin::Output
+* See also: [Output Plugin Overview](https://docs.fluentd.org/v0.14/articles/output-plugin-overview)
 
 ## TestFluentPluginConfigFormatter::ComplexOutput
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.14.23
+  version: 0.14.24
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack