fluentd 0.12.35 → 0.12.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d3102f961d9f56eeac91f42b95c2599067c951
-  data.tar.gz: 5f86c48d0a436f06e8f7c4b2b017e6b301041bae
+  metadata.gz: f13bb194b66ee28b2bd8cf431379f73d47dcda0f
+  data.tar.gz: ca8542ad12a51d6d11f70de34caca3e5a2c559b2
 SHA512:
-  metadata.gz: b34637aa560ca457b313f9caf63f5fa8df8fa79398a876efa24299e3f7537719e03c745a5bc302f04f78975a81e6e5b959b4f5867c684cdf8bdf057aef37137d
-  data.tar.gz: 01b2bec5a9948f4a10e12f66bbe2b91427dfb6127834a9dfba8bf0ba8b28e10a39a1e1dd6dad1241b18a781b640cb03aff2924cd9713956e2f2fc6e87831fd5f
+  metadata.gz: fa2d7ec85fa220ae426509a3f97b1438521b8451b82bfed553097fd40fc7805e0f9e6e4f396c08d4b5e5ea7b4308809be43f060f1744e27811dc56f31e8b0c8f
+  data.tar.gz: 99d942d58b3e04e6f172849ae60c4c23bb2abe259bdbcdd6297803fb005ba57905caf5ceaef320c7a051686b0bec7bb47081f0fbac20c13041eff903ec18af44

data/ChangeLog

@@ -1,5 +1,25 @@
 # v0.12
 
+## Release 0.12.36 - 2017/05/24
+
+### New features / Enhancement
+
+* 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
+* in_tail: Add ignore_repeated_permission_error parameter
+  https://github.com/fluent/fluentd/pull/1574
+
+### Bug fixes
+
+* in_monitor_agent: Enable in_monitor_agent to find plugin type from its class
+  https://github.com/fluent/fluentd/pull/1564
+* Ruby 2.4 warns to forward private methods
+  https://github.com/fluent/fluentd/pull/1579
+* log: Add missing '<<' method to delegators
+  https://github.com/fluent/fluentd/pull/1558
+
 ## Release 0.12.35 - 2017/04/19
 
 ### Bug fixes

data/lib/fluent/config/literal_parser.rb

@@ -181,6 +181,8 @@ module Fluent
           "\f"
         when "b"
           "\b"
+        when "0"
+          "\0"
         when /[a-zA-Z0-9]/
           parse_error! "unexpected back-slash escape character '#{c}'"
         else  # symbols

data/lib/fluent/log.rb

@@ -248,25 +248,6 @@ module Fluent
       @out.flush
     end
 
-    private
-
-    def dump_stacktrace(backtrace, level)
-      return if @level > level
-
-      time = Time.now
-      line = caller_line(time, 5, level)
-      if @suppress_repeated_stacktrace && (Thread.current[:last_repeated_stacktrace] == backtrace)
-        puts ["  ", line, 'suppressed same stacktrace'].join
-      else
-        backtrace.each { |msg|
-          puts ["  ", line, msg].join
-        }
-        Thread.current[:last_repeated_stacktrace] = backtrace if @suppress_repeated_stacktrace
-      end
-
-      nil
-    end
-
     def event(level, args)
       time = Time.now
       message = ''
@@ -310,6 +291,25 @@ module Fluent
       end
       return log_msg
     end
+
+    private
+
+    def dump_stacktrace(backtrace, level)
+      return if @level > level
+
+      time = Time.now
+      line = caller_line(time, 5, level)
+      if @suppress_repeated_stacktrace && (Thread.current[:last_repeated_stacktrace] == backtrace)
+        puts ["  ", line, 'suppressed same stacktrace'].join
+      else
+        backtrace.each { |msg|
+          puts ["  ", line, msg].join
+        }
+        Thread.current[:last_repeated_stacktrace] = backtrace if @suppress_repeated_stacktrace
+      end
+
+      nil
+    end
   end
 
 
@@ -342,7 +342,7 @@ module Fluent
     extend Forwardable
     def_delegators '@logger', :enable_color?, :enable_debug, :enable_event,
       :disable_events, :tag, :tag=, :time_format, :time_format=,
-      :event, :caller_line, :puts, :write, :flush, :out, :out=
+      :event, :caller_line, :puts, :write, :<<, :flush, :out, :out=
   end
 
 

data/lib/fluent/parser.rb

@@ -71,7 +71,11 @@ module Fluent
         @cache2_time = nil
         @parser =
           if time_format
-            Proc.new { |value| Time.strptime(value, time_format) }
+            if time_format == '%iso8601'
+              Proc.new { |value| Time.iso8601(value) }
+            else
+              Proc.new { |value| Time.strptime(value, time_format) }
+            end
           else
             Time.method(:parse)
           end

data/lib/fluent/plugin/in_monitor_agent.rb

@@ -379,7 +379,7 @@ module Fluent
     # multiple plugins could have the same type
     def plugins_info_by_type(type, opts={})
       array = all_plugins.select {|pe|
-        (pe.config['@type'] == type || pe.config['type'] == type) rescue nil
+        (pe.config['@type'] == type || pe.config['type'] == type || Fluent::Plugin.lookup_name_from_class(pe.class)) rescue nil
       }
       array.map {|pe|
         get_monitor_info(pe, opts)
@@ -403,7 +403,7 @@ module Fluent
       # Common plugin information
       obj['plugin_id'] = pe.plugin_id
       obj['plugin_category'] = plugin_category(pe)
-      obj['type'] = pe.config['@type'] || pe.config['type']
+      obj['type'] = pe.config['@type'] || pe.config['type'] || Fluent::Plugin.lookup_name_from_class(pe.class)
       obj['config'] = pe.config if opts[:with_config]
 
       # run MONITOR_INFO in plugins' instance context and store the info to obj

data/lib/fluent/plugin/in_tail.rb

@@ -28,6 +28,7 @@ module Fluent
       super
       @paths = []
       @tails = {}
+      @ignore_list = []
     end
 
     desc 'The paths to read. Multiple paths can be specified, separated by comma.'
@@ -62,6 +63,8 @@ module Fluent
     config_param :limit_recently_modified, :time, default: nil
     desc 'Enable the option to skip the refresh of watching list on startup.'
     config_param :skip_refresh_on_startup, :bool, default: false
+    desc 'Ignore repeated permission error logs'
+    config_param :ignore_repeated_permission_error, :bool, default: false
 
     attr_reader :paths
 
@@ -166,7 +169,10 @@ module Fluent
               end
             else
               if is_file
-                log.warn "#{p} unreadable. It is excluded and would be examined next time."
+                unless @ignore_list.include?(path)
+                  log.warn "#{p} unreadable. It is excluded and would be examined next time."
+                  @ignore_list << path if @ignore_repeated_permission_error
+                end
               end
               false
             end

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.35'
+  VERSION = '0.12.36'
 
 end

data/test/config/test_literal_parser.rb

@@ -105,8 +105,8 @@ module Fluent::Config
       test('"\\.t"') { assert_text_parsed_as(".t", '"\\.t"') }
       test('"\\$t"') { assert_text_parsed_as("$t", '"\\$t"') }
       test('"\\"') { assert_text_parsed_as("#t", '"\\#t"') }
+      test('"\\0"') { assert_text_parsed_as("\0", '"\\0"') }
       test('"\\z"') { assert_parse_error('"\\z"') }  # unknown escaped character
-      test('"\\0"') { assert_parse_error('"\\0"') }  # unknown escaped character
       test('"\\1"') { assert_parse_error('"\\1"') }  # unknown escaped character
       test('"t') { assert_parse_error('"t') }  # non-terminated quoted character
       test("\"t\nt\"") { assert_text_parsed_as("t\nt", "\"t\nt\"" ) } # multiline string

data/test/plugin/test_in_tail.rb

@@ -50,6 +50,7 @@ class TailInputTest < Test::Unit::TestCase
     assert_equal 2, d.instance.rotate_wait
     assert_equal "#{TMP_DIR}/tail.pos", d.instance.pos_file
     assert_equal 1000, d.instance.read_lines_limit
+    assert_equal false, d.instance.ignore_repeated_permission_error
   end
 
   def test_configure_encoding

data/test/test_log.rb

@@ -307,6 +307,8 @@ class PluginLoggerTest < Test::Unit::TestCase
 
     def test_write_alias
       assert(@log.respond_to?(:<<))
+      mock(@log.out).write("log")
+      @log << "log"
     end
 
     def test_out

data/test/test_parser.rb

@@ -74,6 +74,15 @@ module ParserTest
       assert_equal_event_time(time, parser.parse('28/Feb/2013:12:00:00 +0900'))
     end
 
+    data('with sec' => '2017-01-01T12:00:00+09:00',
+         'with msec' => '2017-01-01T12:00:00.123+09:00')
+    def test_parse_with_iso8601(data)
+      parser = TextParser::TimeParser.new('%iso8601')
+
+      time = event_time(data)
+      assert_equal_event_time(time, parser.parse(data))
+    end
+
     def test_parse_with_invalid_argument
       parser = TextParser::TimeParser.new(nil)
 

metadata

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