fluentd 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7457e2a191772c11ca520188030ea3ef06c211d
-  data.tar.gz: 2ae8a9864a31245d3fca6756cb4f39c82aed53fc
+  metadata.gz: '08745174bdefc09fdc359003c6acb65f63d58bac'
+  data.tar.gz: 45e36b62fe808b05273d98eab2ca69c0e46b8c93
 SHA512:
-  metadata.gz: 6ad103cd892630b1c15452a4749ddba854b2ca73e87bbe252bdf75a7a85964589801e21d002bf6140b23d107dbed207e856a0eaee275ea04c895ebb5df31d361
-  data.tar.gz: 44cfc8efcc83ac52e55fb35afcc93486dbb44ed9ee84ac20fa8da335a011812f04eb256bdb55d741facc8bdbb5e87728d75c11f118fe370f7690b553b082223a
+  metadata.gz: b855e7e95bd3d6b29b50a6b4ba3321a4fd4166c4e0ef8bd4ab104252bd1b6b738a16eb8a93eae35cbf4b1daf7a8ad209d7ef1cb3be508633071d9490ccb15ffb
+  data.tar.gz: 90754b2ba1765da45e47906866dbb3cfd77bd5373134e9f160b58f3bab3832e1db144124a2665cec19a7e731c70620edf7f14a9d453cd452646263dcc4b14b74

data/.travis.yml

@@ -13,7 +13,9 @@ matrix:
       os: linux
     - rvm: 2.3.3
       os: linux
-    - rvm: 2.4.2
+    - rvm: 2.4.3
+      os: linux
+    - rvm: 2.5.0
       os: linux
     - rvm: ruby-head
       os: linux
@@ -47,6 +49,9 @@ branches:
     - v0.12
     - v0.14
 
+before_install:
+  - gem update --system
+
 sudo: false
 dist: trusty # for TLSv1.2 support
 

data/CHANGELOG.md

@@ -1,4 +1,32 @@
-# v1.0
+# v1.1
+
+## Release v1.1.1 - 2018/03/05
+
+### Enhancements
+
+* in_debug_agent: Support multi worker environment
+  https://github.com/fluent/fluentd/pull/1869
+* in_forward: Improve SSL setup to support mutual TLS
+  https://github.com/fluent/fluentd/pull/1861
+* buf_file: Skip and delete broken file chunks to avoid unsuccessful retry in resume
+  https://github.com/fluent/fluentd/pull/1874
+* command: Show fluentd version for debug purpose
+  https://github.com/fluent/fluentd/pull/1839
+
+### Bug fixes
+
+* in_forward: Do not close connection until write is complete on failed auth PONG
+  https://github.com/fluent/fluentd/pull/1835
+* in_tail: Fix IO event race condition during shutdown
+  https://github.com/fluent/fluentd/pull/1876
+* in_http: Emit event time instead of raw time value in batch
+  https://github.com/fluent/fluentd/pull/1850
+* parser_json: Add EncodingError to rescue list for oj 3.x.
+  https://github.com/fluent/fluentd/pull/1875
+* config: Fix config_param for string type with frozen string
+  https://github.com/fluent/fluentd/pull/1838
+* timer: Fix a bug to leak non-repeating timer watchers
+  https://github.com/fluent/fluentd/pull/1864
 
 ## Release v1.1.0 - 2018/01/17
 
@@ -25,6 +53,8 @@
   https://github.com/fluent/fluentd/pull/1805
 * time: Fix the method for TimeFormatter#call
   https://github.com/fluent/fluentd/pull/1813
+  
+# v1.0
 
 ## Release v1.0.2 - 2017/12/17
 

data/GOVERNANCE.md

@@ -35,7 +35,7 @@ After 6 months a maintainer will be made an "owner" of the GitHub organization.
 
 ## Projects
 
-The fluent organization is open to receive new projects under it umbrella. To apply a project as part of the __fluent__ organization, it have to met the following criteria:
+The fluent organization is open to receive new sub-projects under it umbrella. To apply a project as part of the __fluent__ organization, it have to met the following criteria:
 
 - Licensed under the terms of the Apache License v2.0
 - Project have been active for at least one year since it inception
@@ -46,7 +46,7 @@ The fluent organization is open to receive new projects under it umbrella. To ap
   - Metering
 - Be supported by 2/3 majority of organization
 
-The submission process starts as a Pull Request on Fluentd repository with the required information mentioned above.
+The submission process starts as a Pull Request on Fluentd repository with the required information mentioned above. Once a project is accepted, it's considered a __CNCF sub-project under the umbrella of Fluentd__
 
 ## Code of Conduct
 

data/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

data/lib/fluent/command/binlog_reader.rb

@@ -22,6 +22,7 @@ require 'fluent/formatter'
 require 'fluent/plugin'
 require 'fluent/config/element'
 require 'fluent/engine'
+require 'fluent/version'
 
 class FluentBinlogReader
   SUBCOMMAND = %w(cat head formats)
@@ -49,7 +50,14 @@ HELP
 
   def command
     command = @argv.shift
-    if !command || !SUBCOMMAND.include?(command)
+    if command
+      if command == '--version'
+        puts "#{File.basename($PROGRAM_NAME)} #{Fluent::VERSION}"
+        exit 0
+      elsif !SUBCOMMAND.include?(command)
+        usage "'#{command}' is not supported: Required subcommand : #{SUBCOMMAND.join(' | ')}"
+      end
+    else
       usage "Required subcommand : #{SUBCOMMAND.join(' | ')}"
     end
 
@@ -70,6 +78,7 @@ module BinlogReaderCommand
 
       @options = { plugin: [] }
       @opt_parser = OptionParser.new do |opt|
+        opt.version = Fluent::VERSION
         opt.separator 'Options:'
 
         opt.on('-p DIR', '--plugin', 'add library directory path') do |v|

data/lib/fluent/command/ca_generate.rb

@@ -1,6 +1,7 @@
 require 'openssl'
 require 'optparse'
 require 'fileutils'
+require 'fluent/version'
 
 module Fluent
   class CaGenerate
@@ -12,7 +13,7 @@ module Fluent
       cert_common_name: 'Fluentd Forward CA',
     }
     HELP_TEXT = <<HELP
-Usage: fluent-ca-genrate DIR_PATH PRIVATE_KEY_PASSPHRASE [--country COUNTRY] [--state STATE] [--locality LOCALITY] [--common-name COMMON_NAME]
+Usage: fluent-ca-generate DIR_PATH PRIVATE_KEY_PASSPHRASE [--country COUNTRY] [--state STATE] [--locality LOCALITY] [--common-name COMMON_NAME]
 HELP
 
     def initialize(argv = ARGV)
@@ -145,6 +146,7 @@ HELP
 
     def configure_option_parser
       @opt_parser.banner = HELP_TEXT
+      @opt_parser.version = Fluent::VERSION
 
       @opt_parser.on('--key-length [KEY_LENGTH]',
                      "configure key length. (default: #{DEFAULT_OPTIONS[:private_key_length]})") do |v|

data/lib/fluent/command/cat.rb

@@ -18,10 +18,12 @@ require 'optparse'
 require 'fluent/env'
 require 'fluent/time'
 require 'fluent/msgpack_factory'
+require 'fluent/version'
 
 op = OptionParser.new
 
 op.banner += " <tag>"
+op.version = Fluent::VERSION
 
 port = 24224
 host = '127.0.0.1'

data/lib/fluent/command/plugin_config_formatter.rb

@@ -22,6 +22,7 @@ require "fluent/env"
 require "fluent/engine"
 require "fluent/system_config"
 require "fluent/config/element"
+require 'fluent/version'
 
 class FluentPluginConfigFormatter
 
@@ -210,6 +211,7 @@ class FluentPluginConfigFormatter
 
   def prepare_option_parser
     @parser = OptionParser.new
+    @parser.version = Fluent::VERSION
     @parser.banner = <<BANNER
 Usage: #{$0} [options] <type> <name>
 

data/lib/fluent/command/plugin_generator.rb

@@ -21,6 +21,7 @@ require "erb"
 require "open-uri"
 
 require "fluent/registry"
+require 'fluent/version'
 
 class FluentPluginGenerator
   attr_reader :type, :name
@@ -91,6 +92,7 @@ class FluentPluginGenerator
 
   def prepare_parser
     @parser = OptionParser.new
+    @parser.version = Fluent::VERSION
     @parser.banner = <<BANNER
 Usage: fluent-plugin-generate [options] <type> <name>
 

data/lib/fluent/config/types.rb

@@ -64,7 +64,11 @@ module Fluent
       end
     end
 
-    STRING_TYPE = Proc.new { |val, opts| val.to_s.force_encoding(Encoding::UTF_8) }
+    STRING_TYPE = Proc.new { |val, opts|
+      v = val.to_s
+      v = v.frozen? ? v.dup : v # config_param can't assume incoming string is mutable
+      v.force_encoding(Encoding::UTF_8)
+    }
     ENUM_TYPE = Proc.new { |val, opts|
       s = val.to_sym
       list = opts[:list]

data/lib/fluent/plugin/buf_file.rb

@@ -141,7 +141,13 @@ module Fluent
             next
           end
 
-          chunk = Fluent::Plugin::Buffer::FileChunk.new(m, path, mode) # file chunk resumes contents of metadata
+          begin
+            chunk = Fluent::Plugin::Buffer::FileChunk.new(m, path, mode) # file chunk resumes contents of metadata
+          rescue Fluent::Plugin::Buffer::FileChunk::FileChunkError => e
+            handle_broken_files(path, mode, e)
+            next
+          end
+
           case chunk.state
           when :staged
             stage[chunk.metadata] = chunk
@@ -167,6 +173,12 @@ module Fluent
 
         return chunk
       end
+
+      def handle_broken_files(path, mode, e)
+        log.error "found broken chunk file during resume. Deleted corresponding files:", :path => path, :mode => mode, :err_msg => e.message
+        # After support 'backup_dir' feature, these files are moved to backup_dir instead of unlink.
+        File.unlink(path, path + '.meta') rescue nil
+      end
     end
   end
 end

data/lib/fluent/plugin/buffer/file_chunk.rb

@@ -22,6 +22,8 @@ module Fluent
   module Plugin
     class Buffer
       class FileChunk < Chunk
+        class FileChunkError < StandardError; end
+
         ### buffer path user specified : /path/to/directory/user_specified_prefix.*.log
         ### buffer chunk path          : /path/to/directory/user_specified_prefix.b513b61c9791029c2513b61c9791029c2.log
         ### buffer chunk metadata path : /path/to/directory/user_specified_prefix.b513b61c9791029c2513b61c9791029c2.log.meta
@@ -309,6 +311,8 @@ module Fluent
           # staging buffer chunk without metadata is classic buffer chunk file
           # and it should be enqueued immediately
           if File.exist?(@meta_path)
+            raise FileChunkError, "staged file chunk is empty" if File.size(@path).zero?
+
             @chunk = File.open(@path, 'rb+')
             @chunk.set_encoding(Encoding::ASCII_8BIT)
             @chunk.sync = true
@@ -319,7 +323,13 @@ module Fluent
             @meta.set_encoding(Encoding::ASCII_8BIT)
             @meta.sync = true
             @meta.binmode
-            restore_metadata(@meta.read)
+            begin
+              restore_metadata(@meta.read)
+            rescue => e
+              @chunk.close
+              @meta.close
+              raise FileChunkError, "staged meta file is broken. #{e.message}"
+            end
             @meta.seek(0, IO::SEEK_SET)
 
             @state = :staged
@@ -345,6 +355,8 @@ module Fluent
 
         def load_existing_enqueued_chunk(path)
           @path = path
+          raise FileChunkError, "enqueued file chunk is empty" if File.size(@path).zero?
+
           @chunk = File.open(@path, 'rb')
           @chunk.set_encoding(Encoding::ASCII_8BIT)
           @chunk.binmode
@@ -354,7 +366,12 @@ module Fluent
 
           @meta_path = @path + '.meta'
           if File.readable?(@meta_path)
-            restore_metadata(File.open(@meta_path){|f| f.set_encoding(Encoding::ASCII_8BIT); f.binmode; f.read })
+            begin
+              restore_metadata(File.open(@meta_path){|f| f.set_encoding(Encoding::ASCII_8BIT); f.binmode; f.read })
+            rescue => e
+              @chunk.close
+              raise FileChunkError, "enqueued meta file is broken. #{e.message}"
+            end
           else
             restore_metadata_partially(@chunk)
           end

data/lib/fluent/plugin/in_debug_agent.rb

@@ -34,6 +34,9 @@ module Fluent::Plugin
 
     def configure(conf)
       super
+      if system_config.workers > 1
+        @port += fluentd_worker_id
+      end
       if @unix_path
         unless ::Fluent::FileUtil.writable?(@unix_path)
           raise Fluent::ConfigError, "in_debug_agent: `#{@unix_path}` is not writable"
@@ -41,6 +44,10 @@ module Fluent::Plugin
       end
     end
 
+    def multi_workers_ready?
+      @unix_path.nil?
+    end
+
     def start
       super
 
@@ -50,7 +57,7 @@ module Fluent::Plugin
       else
         uri = "druby://#{@bind}:#{@port}"
       end
-      log.info "listening dRuby", uri: uri, object: @object
+      log.info "listening dRuby", uri: uri, object: @object, worker: fluentd_worker_id
       obj = eval(@object)
       @server = DRb::DRbServer.new(uri, obj)
     end

data/lib/fluent/plugin/in_forward.rb

@@ -199,8 +199,8 @@ module Fluent::Plugin
         when :pingpong
           success, reason_or_salt, shared_key = check_ping(msg, conn.remote_addr, user_auth_salt, nonce)
           unless success
+            conn.on(:write_complete) { |c| c.close }
             send_data.call(serializer, generate_pong(false, reason_or_salt, nonce, shared_key))
-            conn.close
             next
           end
           send_data.call(serializer, generate_pong(true, reason_or_salt, nonce, shared_key))

data/lib/fluent/plugin/in_http.rb

@@ -202,7 +202,11 @@ module Fluent::Plugin
             if @add_remote_addr
               single_record['REMOTE_ADDR'] = params['REMOTE_ADDR']
             end
-            single_time = single_record.delete("time") || time
+            single_time = if t = single_record.delete('time')
+                            Fluent::EventTime.from_time(Time.at(t))
+                          else
+                            time
+                          end
             mes.add(single_time, single_record)
           end
           router.emit_stream(tag, mes)

data/lib/fluent/plugin/in_tail.rb

@@ -678,10 +678,15 @@ module Fluent::Plugin
           @iobuf = ''.force_encoding('ASCII-8BIT')
           @lines = []
           @io = nil
+          @notify_mutex = Mutex.new
           @watcher.log.info "following tail of #{@watcher.path}"
         end
 
         def on_notify
+          @notify_mutex.synchronize { handle_notify }
+        end
+
+        def handle_notify
           with_io do |io|
             begin
               read_more = false

data/lib/fluent/plugin/parser_json.rb

@@ -62,7 +62,7 @@ module Fluent
         r = @load_proc.call(text)
         time, record = convert_values(parse_time(r), r)
         yield time, record
-      rescue @error_class
+      rescue @error_class, EncodingError # EncodingError is for oj 3.x or later
         yield nil, nil
       end
 

data/lib/fluent/plugin_helper/cert_option.rb

@@ -33,6 +33,11 @@ module Fluent
           ctx.ciphers = ciphers
         end
 
+        if conf.client_cert_auth
+            ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+        end
+
+        ctx.ca_file = conf.ca_path
         ctx.cert = cert
         ctx.key = key
         if extra && !extra.empty?

data/lib/fluent/plugin_helper/event_loop.rb

@@ -43,6 +43,15 @@ module Fluent
         end
       end
 
+      def event_loop_detach(watcher)
+        if watcher.attached?
+          watcher.detach
+        end
+        @_event_loop_mutex.synchronize do
+          @_event_loop_attached_watchers.delete(watcher)
+        end
+      end
+
       def event_loop_wait_until_start
         sleep(0.1) until event_loop_running?
       end

data/lib/fluent/plugin_helper/server.rb

@@ -237,7 +237,7 @@ module Fluent
 
       SERVER_TRANSPORT_PARAMS = [
         :protocol, :version, :ciphers, :insecure,
-        :cert_path, :private_key_path, :private_key_passphrase,
+        :ca_path, :cert_path, :private_key_path, :private_key_passphrase, :client_cert_auth,
         :ca_cert_path, :ca_private_key_path, :ca_private_key_passphrase,
         :generate_private_key_length,
         :generate_cert_country, :generate_cert_state, :generate_cert_state,
@@ -271,9 +271,11 @@ module Fluent
           config_param :insecure, :bool, default: false
 
           # Cert signed by public CA
+          config_param :ca_path, :string, default: nil
           config_param :cert_path, :string, default: nil
           config_param :private_key_path, :string, default: nil
           config_param :private_key_passphrase, :string, default: nil, secret: true
+          config_param :client_cert_auth, :bool, default: false
 
           # Cert generated and signed by private CA Certificate
           config_param :ca_cert_path, :string, default: nil

data/lib/fluent/plugin_helper/timer.rb

@@ -15,6 +15,7 @@
 #
 
 require 'fluent/plugin_helper/event_loop'
+require 'set'
 
 module Fluent
   module PluginHelper
@@ -33,7 +34,8 @@ module Fluent
         raise ArgumentError, "BUG: title must be a symbol" unless title.is_a? Symbol
         raise ArgumentError, "BUG: block not specified for callback" unless block_given?
         checker = ->(){ @_timer_running }
-        timer = TimerWatcher.new(title, interval, repeat, log, checker, &block)
+        detacher = ->(watcher){ event_loop_detach(watcher) }
+        timer = TimerWatcher.new(title, interval, repeat, log, checker, detacher, &block)
         @_timers << title
         event_loop_attach(timer)
         timer
@@ -45,7 +47,7 @@ module Fluent
 
       def initialize
         super
-        @_timers = []
+        @_timers ||= Set.new
       end
 
       def start
@@ -60,16 +62,17 @@ module Fluent
 
       def terminate
         super
-        @_timers = []
+        @_timers = nil
       end
 
       class TimerWatcher < Coolio::TimerWatcher
-        def initialize(title, interval, repeat, log, checker, &callback)
+        def initialize(title, interval, repeat, log, checker, detacher, &callback)
           @title = title
           @callback = callback
           @repeat = repeat
           @log = log
           @checker = checker
+          @detacher = detacher
           super(interval, repeat)
         end
 
@@ -81,9 +84,7 @@ module Fluent
           detach
           @log.error "Timer detached.", title: @title
         ensure
-          if attached?
-            detach unless @repeat
-          end
+          @detacher.call(self) unless @repeat
         end
       end
     end

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 
 end

data/test/config/test_configurable.rb

@@ -508,6 +508,11 @@ module Fluent::Config
           assert_instance_of(ConfigurableSpec::Base2, b2.configure(config_element("", "", {"name1" => "t1", "name5" => "t5", "opt3" => "a"})))
         end
 
+        test 'can accept frozen string' do
+          b2 = ConfigurableSpec::Base2.new
+          assert_instance_of(ConfigurableSpec::Base2, b2.configure(config_element("", "", {"name1" => "t1".freeze, "name5" => "t5", "opt3" => "a"})))
+        end
+
         test 'raise errors without any specifications for param without defaults' do
           b2 = ConfigurableSpec::Base2.new
           assert_raise(Fluent::ConfigError) { b2.configure(config_element("", "", {})) }

data/test/plugin/test_buf_file.rb

@@ -840,4 +840,128 @@ class FileBufferTest < Test::Unit::TestCase
       assert File.exist?(@not_chunk)
     end
   end
+
+  sub_test_case 'there are existing broken file chunks' do
+    setup do
+      @bufdir = File.expand_path('../../tmp/broken_buffer_file', __FILE__)
+      FileUtils.mkdir_p @bufdir unless File.exist?(@bufdir)
+      @bufpath = File.join(@bufdir, 'broken_test.*.log')
+
+      Fluent::Test.setup
+      @d = FluentPluginFileBufferTest::DummyOutputPlugin.new
+      @p = Fluent::Plugin::FileBuffer.new
+      @p.owner = @d
+      @p.configure(config_element('buffer', '', {'path' => @bufpath}))
+    end
+
+    teardown do
+      if @p
+        @p.stop unless @p.stopped?
+        @p.before_shutdown unless @p.before_shutdown?
+        @p.shutdown unless @p.shutdown?
+        @p.after_shutdown unless @p.after_shutdown?
+        @p.close unless @p.closed?
+        @p.terminate unless @p.terminated?
+      end
+      if @bufdir
+        Dir.glob(File.join(@bufdir, '*')).each do |path|
+          next if ['.', '..'].include?(File.basename(path))
+          File.delete(path)
+        end
+      end
+    end
+
+    def create_first_chunk(mode)
+      cid = Fluent::UniqueId.generate
+      path = File.join(@bufdir, "broken_test.#{mode}#{Fluent::UniqueId.hex(cid)}.log")
+      File.open(path, 'wb') do |f|
+        f.write ["t1.test", event_time('2016-04-17 14:00:15 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t2.test", event_time('2016-04-17 14:00:17 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t3.test", event_time('2016-04-17 14:00:21 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t4.test", event_time('2016-04-17 14:00:28 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+      end
+      write_metadata(
+        path + '.meta', cid, metadata(timekey: event_time('2016-04-17 14:00:00 -0700').to_i),
+        4, event_time('2016-04-17 14:00:00 -0700').to_i, event_time('2016-04-17 14:00:28 -0700').to_i
+      )
+
+      return cid, path
+    end
+
+    def create_second_chunk(mode)
+      cid = Fluent::UniqueId.generate
+      path = File.join(@bufdir, "broken_test.#{mode}#{Fluent::UniqueId.hex(cid)}.log")
+      File.open(path, 'wb') do |f|
+        f.write ["t1.test", event_time('2016-04-17 14:01:15 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t2.test", event_time('2016-04-17 14:01:17 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+        f.write ["t3.test", event_time('2016-04-17 14:01:21 -0700').to_i, {"message" => "yay"}].to_json + "\n"
+      end
+      write_metadata(
+        path + '.meta', cid, metadata(timekey: event_time('2016-04-17 14:01:00 -0700').to_i),
+        3, event_time('2016-04-17 14:01:00 -0700').to_i, event_time('2016-04-17 14:01:25 -0700').to_i
+      )
+
+      return cid, path
+    end
+
+    def compare_staged_chunk(staged, id, time, num, mode)
+      assert_equal 1, staged.size
+      m = metadata(timekey: event_time(time).to_i)
+      assert_equal id, staged[m].unique_id
+      assert_equal num, staged[m].size
+      assert_equal mode, staged[m].state
+    end
+
+     def compare_queued_chunk(queued, id, num, mode)
+      assert_equal 1, queued.size
+      assert_equal id, queued[0].unique_id
+      assert_equal num, queued[0].size
+      assert_equal mode, queued[0].state
+    end
+
+    def compare_log(plugin, msg)
+      logs = plugin.log.out.logs
+      assert { logs.any? { |log| log.include?(msg) } }
+    end
+
+    test '#resume ignores staged empty chunk' do
+      _, p1 = create_first_chunk('b')
+      File.open(p1, 'wb') { |f| } # create staged empty chunk file
+      c2id, _ = create_second_chunk('b')
+
+      @p.start
+      compare_staged_chunk(@p.stage, c2id, '2016-04-17 14:01:00 -0700', 3, :staged)
+      compare_log(@p, 'staged file chunk is empty')
+    end
+
+    test '#resume ignores staged broken metadata' do
+      c1id, _ = create_first_chunk('b')
+      _, p2 = create_second_chunk('b')
+      File.open(p2 + '.meta', 'wb') { |f| f.write("\0" * 70) } # create staged broken meta file
+
+      @p.start
+      compare_staged_chunk(@p.stage, c1id, '2016-04-17 14:00:00 -0700', 4, :staged)
+      compare_log(@p, 'staged meta file is broken')
+    end
+
+    test '#resume ignores enqueued empty chunk' do
+      _, p1 = create_first_chunk('q')
+      File.open(p1, 'wb') { |f| } # create enqueued empty chunk file
+      c2id, _ = create_second_chunk('q')
+
+      @p.start
+      compare_queued_chunk(@p.queue, c2id, 3, :queued)
+      compare_log(@p, 'enqueued file chunk is empty')
+    end
+
+    test '#resume ignores enqueued broken metadata' do
+      c1id, _ = create_first_chunk('q')
+      _, p2 = create_second_chunk('q')
+      File.open(p2 + '.meta', 'wb') { |f| f.write("\0" * 70) } # create enqueued broken meta file
+
+      @p.start
+      compare_queued_chunk(@p.queue, c1id, 4, :queued)
+      compare_log(@p, 'enqueued meta file is broken')
+    end
+  end
 end

data/test/plugin/test_in_debug_agent.rb

@@ -25,4 +25,25 @@ class DebugAgentInputTest < Test::Unit::TestCase
       create_driver %[unix_path #{TMP_DIR}/does_not_exist/test_path]
     end
   end
+
+  def test_multi_worker_environment_with_port
+    Fluent::SystemConfig.overwrite_system_config('workers' => 4) do
+      d = Fluent::Test::Driver::Input.new(Fluent::Plugin::DebugAgentInput)
+      d.instance.instance_eval { @_fluentd_worker_id = 2 }
+      d.configure('port 24230')
+
+      assert_true d.instance.multi_workers_ready?
+      assert_equal(24232, d.instance.instance_variable_get(:@port))
+    end
+  end
+
+  def test_multi_worker_environment_with_unix_path
+    Fluent::SystemConfig.overwrite_system_config('workers' => 4) do
+      d = Fluent::Test::Driver::Input.new(Fluent::Plugin::DebugAgentInput)
+      d.instance.instance_eval { @_fluentd_worker_id = 2 }
+      d.configure("unix_path #{TMP_DIR}/test_path")
+
+      assert_false d.instance.multi_workers_ready?
+    end
+  end
 end

data/test/plugin/test_in_http.rb

@@ -137,6 +137,31 @@ class HttpInputTest < Test::Unit::TestCase
     assert_equal_event_time time, d.events[1][1]
   end
 
+  def test_multi_json_with_time_field
+    d = create_driver
+    time = event_time("2011-01-02 13:14:15 UTC")
+    time_i = time.to_i
+    time_f = time.to_f
+
+    records = [{"a" => 1, 'time' => time_i},{"a" => 2, 'time' => time_f}]
+    events = [
+      ["tag1", time, {'a' => 1}],
+      ["tag1", time, {'a' => 2}],
+    ]
+    tag = "tag1"
+    res_codes = []
+    d.run(expect_records: 2, timeout: 5) do
+      res = post("/#{tag}", {"json" => records.to_json})
+      res_codes << res.code
+    end
+    assert_equal ["200"], res_codes
+    assert_equal events, d.events
+    assert_instance_of Fluent::EventTime, d.events[0][1]
+    assert_instance_of Fluent::EventTime, d.events[1][1]
+    assert_equal_event_time time, d.events[0][1]
+    assert_equal_event_time time, d.events[1][1]
+  end
+
   def test_json_with_add_remote_addr
     d = create_driver(CONFIG + "add_remote_addr true")
     time = event_time("2011-01-02 13:14:15 UTC")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -333,6 +333,7 @@ files:
 - ENTERPRISE_PROVIDERS.md
 - GOVERNANCE.md
 - Gemfile
+- LICENSE
 - MAINTAINERS.md
 - README.md
 - Rakefile