fluentd 1.12.3-x64-mingw32 → 1.12.4-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a95544b9d91309608d82ca124db9f320e7d03f5b807c46a0d921aa5d4052fd2d
-  data.tar.gz: 6d80a00cda2a7cfaab06abb73e33de77bc6fb6aded7c169a08331e1ac43a626c
+  metadata.gz: 99045b602fdb2daf65473e6dba493bb6929a8707e733907969ee966519fb79f6
+  data.tar.gz: 9fa82ab5b4c9202562b79574ee587260fce902e554f30fe2f672fca287aede16
 SHA512:
-  metadata.gz: 4573c3999a649f235e09ab00cb2065aa59b4e5f975ff7b4914082fd57b3f1f1941a025d31d4e52436da1d1fa685d2ee95b68a8b59b642e368bbc9cd6b488335d
-  data.tar.gz: a3d8a9f0aea51fc1bdd95924631908448464d6f2da6871d39338cd790f4ad1d05e7214da26f43bdcc101ae469025a1c74375ae2a34db7d8642f6b17d3f7cd592
+  metadata.gz: 914482f62763cf8733ec3d7a35de3901799d73be307540f566d5ea87157a3456e7d91dfff7fc334bf798c571690f08f724987cbe57c691a22c6d1731b20aaaf4
+  data.tar.gz: da63b1ad893ccbf7dce19e9bf11b2c289a93654015babbcc7f12740d57ced424277659096c2addf829d3d85979009172d1e50ee071e85a4058b60ddeaa355f59

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # v1.12
 
+## Release v1.12.4 - 2021/05/26
+
+### Bug fix
+
+* in_tail: Fix a bug that refresh_watcher fails to handle file rotations
+
 ## Release v1.12.3 - 2021/04/23
 
 ### Enhancement

data/lib/fluent/plugin/in_tail/position_file.rb

@@ -248,6 +248,20 @@ module Fluent::Plugin
       end
     end
 
-    TargetInfo = Struct.new(:path, :ino)
+    TargetInfo = Struct.new(:path, :ino) do
+      def ==(other)
+        return false unless other.is_a?(TargetInfo)
+        self.path == other.path
+      end
+
+      def hash
+        self.path.hash
+      end
+
+      def eql?(other)
+        return false unless other.is_a?(TargetInfo)
+        self.path == other.path
+      end
+    end
   end
 end

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.12.3'
+  VERSION = '1.12.4'
 
 end

data/test/plugin/in_tail/test_position_file.rb

@@ -282,4 +282,58 @@ class IntailPositionFileTest < Test::Unit::TestCase
       assert_equal 2, f.read_inode
     end
   end
+
+  sub_test_case "TargetInfo equality rules" do
+    sub_test_case "== operator" do
+      def test_equal
+        t1 = Fluent::Plugin::TailInput::TargetInfo.new("test", 1234)
+        t2 = Fluent::Plugin::TailInput::TargetInfo.new("test", 1235)
+
+        assert_equal t1, t2
+      end
+
+      def test_not_equal
+        t1 = Fluent::Plugin::TailInput::TargetInfo.new("test", 1234)
+        t2 = Fluent::Plugin::TailInput::TargetInfo.new("test2", 1234)
+
+        assert_not_equal t1, t2
+      end
+    end
+
+    sub_test_case "eql? method" do
+      def test_eql?
+        t1 = Fluent::Plugin::TailInput::TargetInfo.new("test", 1234)
+        t2 = Fluent::Plugin::TailInput::TargetInfo.new("test", 5321)
+
+        assert do
+          t1.eql? t2
+        end
+      end
+
+      def test_not_eql?
+        t1 = Fluent::Plugin::TailInput::TargetInfo.new("test2", 1234)
+        t2 = Fluent::Plugin::TailInput::TargetInfo.new("test3", 1234)
+
+        assert do
+          !t1.eql? t2
+        end
+      end
+    end
+
+    sub_test_case "hash" do
+      def test_equal
+        t1 = Fluent::Plugin::TailInput::TargetInfo.new("test", 1234)
+        t2 = Fluent::Plugin::TailInput::TargetInfo.new("test", 7321)
+
+        assert_equal t1.hash, t2.hash
+      end
+
+      def test_not_equal
+        t1 = Fluent::Plugin::TailInput::TargetInfo.new("test", 1234)
+        t2 = Fluent::Plugin::TailInput::TargetInfo.new("test2", 1234)
+
+        assert_not_equal t1.hash, t2.hash
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.4
 platform: x64-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1022,7 +1022,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Fluentd event collector