fluentd 1.7.2-x86-mingw32 → 1.7.3-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f01fd059f474ea947e16e628bba54d59c461531cf20faceef1d5f0713cf2af2d
-  data.tar.gz: 9b4f553f316a4576eb404c3c0d128d285d3fbf3fda6d40797371bcbcd6bd44a1
+  metadata.gz: cca1b46a26c09dbfb07afe3e729dae288efcfd5a4faca6b72b03ee1e5ed29dbc
+  data.tar.gz: 9c820ddda8f2639a658f03b63aaeaac7ab61c95376fa10f7cea7aed2cc7414db
 SHA512:
-  metadata.gz: 6a9d1f1d7d725305d959e4a49aa70dda0fb50952fb7975bc1ea4b2490ad8320c541745fb73521fda9c761979c03a37dd3fb58f0d298a2cd16e56c1edabb6c04d
-  data.tar.gz: 6f0dfae3ddb77f91bbf77a760fd33514fb92f45655f9efb61b44c68b01a3d5f45134c840deb44fac8f075ad514f017eea330eea70d512fdf2dcf566414c39418
+  metadata.gz: d6002bd15c100997ae8ea88b0c38fc04c0878eb2e02f26ab883765a07b09dc306ffdb9394a38e04507ea8729a70d8c3624be91ce6f0b480b75d1f06f7459235f
+  data.tar.gz: 2bee4278a29cee543dfd0cdb285d790231d90fff13ac42fdf8e8af499eb7ab8ae972ffc16af5e9cac89423469e203568df570875b08945018f3bd635d53fa70d

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # v1.7
 
+## Release v1.7.3 - 2019/10/01
+
+### Enhancement
+
+* in_syslog: Replace priority_key with severity_key
+  https://github.com/fluent/fluentd/pull/2636
+
+### Bug fixes
+
+* out_forward: Fix nil error after purge obsoleted sockets in socket cache
+  https://github.com/fluent/fluentd/pull/2635
+* fix typo in ChangeLog
+  https://github.com/fluent/fluentd/pull/2633
+
 ## Release v1.7.2 - 2019/09/19
 
 ### Enhancement
@@ -36,7 +50,7 @@
   https://github.com/fluent/fluentd/pull/2598
 * buf_file_single: fix duplicated path setting check
   https://github.com/fluent/fluentd/pull/2600
-* fix msgpack-ruby depedency to use recent feature
+* fix msgpack-ruby dependency to use recent feature
   https://github.com/fluent/fluentd/pull/2606
 
 
@@ -640,7 +654,7 @@
 
 ## Release v1.0.0 - 2017/12/6
 
-See [CNCF announcment](https://www.cncf.io/blog/2017/12/06/fluentd-v1-0/) :)
+See [CNCF announcement](https://www.cncf.io/blog/2017/12/06/fluentd-v1-0/) :)
 
 ### New features / Enhancements
 
@@ -910,7 +924,7 @@ See [CNCF announcment](https://www.cncf.io/blog/2017/12/06/fluentd-v1-0/) :)
   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
+* config: Add actual value in the placeholder error message
   https://github.com/fluent/fluentd/pull/1497
 * log: Add Fluent::Log#<< to support some SDKs
   https://github.com/fluent/fluentd/pull/1478
@@ -1227,7 +1241,7 @@ See [CNCF announcment](https://www.cncf.io/blog/2017/12/06/fluentd-v1-0/) :)
   https://github.com/fluent/fluentd/pull/1067
 * filter_record_transformer: Fix to prevent overwriting reserved placeholder keys
   https://github.com/fluent/fluentd/pull/1176
-* Migrate some build-in plugins into v0.14 API
+* Migrate some built-in plugins into v0.14 API
   https://github.com/fluent/fluentd/pull/1149
   https://github.com/fluent/fluentd/pull/1151
 * Update dependencies

data/lib/fluent/plugin/in_syslog.rb

@@ -56,7 +56,7 @@ module Fluent::Plugin
       23  => 'local7'
     }
 
-    PRIORITY_MAP = {
+    SEVERITY_MAP = {
       0  => 'emerg',
       1  => 'alert',
       2  => 'crit',
@@ -91,8 +91,8 @@ module Fluent::Plugin
     config_param :resolve_hostname, :bool, default: nil
     desc 'The field name of source address of sender.'
     config_param :source_address_key, :string, default: nil
-    desc 'The field name of the priority.'
-    config_param :priority_key, :string, default: nil
+    desc 'The field name of the severity.'
+    config_param :severity_key, :string, default: nil, alias: :priority_key
     desc 'The field name of the facility.'
     config_param :facility_key, :string, default: nil
 
@@ -119,6 +119,10 @@ module Fluent::Plugin
 
       super
 
+      if conf.has_key?('priority_key')
+        log.warn "priority_key is deprecated. Use severity_key instead"
+      end
+
       @use_default = false
 
       @parser = parser_create
@@ -233,14 +237,14 @@ module Fluent::Plugin
 
         pri ||= record.delete('pri')
         facility = FACILITY_MAP[pri >> 3]
-        priority = PRIORITY_MAP[pri & 0b111]
+        severity = SEVERITY_MAP[pri & 0b111]
 
-        record[@priority_key] = priority if @priority_key
+        record[@severity_key] = severity if @severity_key
         record[@facility_key] = facility if @facility_key
         record[@source_address_key] = sock.remote_addr if @source_address_key
         record[@source_hostname_key] = sock.remote_host if @source_hostname_key
 
-        tag = "#{@tag}.#{facility}.#{priority}"
+        tag = "#{@tag}.#{facility}.#{severity}"
         emit(tag, time, record)
       end
     rescue => e

data/lib/fluent/plugin/out_forward/socket_cache.rb

@@ -81,7 +81,9 @@ module Fluent::Plugin
               end
             end
           end
-          @available_sockets = @available_sockets.select { |_, v| !v.empty? }
+
+          # reuse same object (@available_sockets)
+          @available_sockets.reject! { |_, v| v.empty? }
 
           sockets += @inactive_sockets
           @inactive_sockets.clear

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.7.2'
+  VERSION = '1.7.3'
 
 end

data/test/plugin/out_forward/test_socket_cache.rb

@@ -5,7 +5,7 @@ require 'timecop'
 
 class SocketCacheTest < Test::Unit::TestCase
   sub_test_case 'checkout_or' do
-    test 'when gived key does not exist' do
+    test 'when given key does not exist' do
       c = Fluent::Plugin::ForwardOutput::SocketCache.new(10, $log)
       sock = mock!.open { 'socket' }.subject
       assert_equal('socket', c.checkout_or('key') { sock.open })
@@ -38,6 +38,16 @@ class SocketCacheTest < Test::Unit::TestCase
       sock = mock!.open { new_sock }.subject
       assert_equal(new_sock, c.checkout_or('key') { sock.open })
     end
+
+    test 'reuse same hash object after calling purge_obsolete_socks' do
+      c = Fluent::Plugin::ForwardOutput::SocketCache.new(10, $log)
+      c.checkout_or('key') { 'socket' }
+      c.purge_obsolete_socks
+
+      assert_nothing_raised(NoMethodError) do
+        c.checkout_or('key') { 'new socket' }
+      end
+    end
   end
 
   sub_test_case 'checkin' do

data/test/plugin/test_buffer_file_chunk.rb

@@ -495,7 +495,7 @@ class BufferFileChunkTest < Test::Unit::TestCase
     end
   end
 
-  test 'ensure to remove metadata file if #write_metadata raise an error becuase of disk full' do
+  test 'ensure to remove metadata file if #write_metadata raise an error because of disk full' do
     chunk_path = File.join(@chunkdir, 'test.*.log')
     stub(Fluent::UniqueId).hex(anything) { 'id' } # to fix chunk id
 

data/test/plugin/test_in_syslog.rb

@@ -217,11 +217,15 @@ EOS
     compare_test_result(d.events, tests, {host: host})
   end
 
-  def test_msg_size_with_priority_key
-    d = create_driver([CONFIG, 'priority_key priority'].join("\n"))
+  data(
+    severity_key: 'severity_key',
+    priority_key: 'priority_key',
+  )
+  def test_msg_size_with_severity_key(param_name)
+    d = create_driver([CONFIG, "#{param_name} severity"].join("\n"))
     tests = create_test_case
 
-    priority = 'info'
+    severity = 'info'
     d.run(expect_emits: 2) do
       u = UDPSocket.new
       u.connect('127.0.0.1', PORT)
@@ -231,7 +235,7 @@ EOS
     end
 
     assert(d.events.size > 0)
-    compare_test_result(d.events, tests, {priority: priority})
+    compare_test_result(d.events, tests, {severity: severity})
   end
 
   def test_msg_size_with_facility_key
@@ -311,7 +315,7 @@ EOS
       assert_equal(options[:host], events[i][2]['source_host']) if options[:host]
       assert_equal(options[:address], events[i][2]['source_address']) if options[:address]
       assert_equal(options[:hostname], events[i][2]['source_hostname']) if options[:hostname]
-      assert_equal(options[:priority], events[i][2]['priority']) if options[:priority]
+      assert_equal(options[:severity], events[i][2]['severity']) if options[:severity]
       assert_equal(options[:facility], events[i][2]['facility']) if options[:facility]
     }
   end

data/test/plugin/test_output_as_buffered.rb

@@ -1112,7 +1112,7 @@ class BufferedOutputTest < Test::Unit::TestCase
         assert_equal(0, @i.write_count)
 
         Timecop.freeze(Time.parse('2019-02-09 00:00:12 +0900'))
-        # wirte should be called in few seconds since
+        # write should be called in few seconds since
         # running interval of enque thread is timekey_wait / 11.0.
         waiting(5){ sleep 0.1 until @i.write_count == 1 }
       end

data/test/test_root_agent.rb

@@ -710,7 +710,7 @@ EOC
       end
     end
 
-    test 'raises configuration error for worker id collisions on multi workers syntax when multi avaliable worker_ids are left' do
+    test 'raises configuration error for worker id collisions on multi workers syntax when multi available worker_ids are left' do
       errmsg = "specified worker_id<1> collisions is detected on <worker> directive. Available worker id(s): [2, 3]"
       assert_raise Fluent::ConfigError.new(errmsg) do
         conf = <<-EOC

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: x86-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack