fluentd 1.12.3-x86-mingw32 → 1.12.4-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 975a854dbfdf16b646c33fb0b645ab4cc28c35248178739a82661a4bbc3b57c5
-  data.tar.gz: e0d4f80dc1b9e17b7fa0a9afe71ace2ad906d739312452cf6a8c08aabd4c7893
+  metadata.gz: 2952a85c81b405366049c0cd0f98dbf2e0f9348d47695bcf62ba13f21ffe3574
+  data.tar.gz: 160491284e198cd4c948d0bc68f0b004132f609ccc66bfe6ae420d1d7660c352
 SHA512:
-  metadata.gz: 56c4ab6d7ca1bd60847af1014296d95655c410f944d1c603daa36086a555bdb7baa1f85db9464e10d3eaaed58f1060380236102b6c63d92b8c921a81865ddacf
-  data.tar.gz: f22e82bd8fd2bdd367b273c73abe617e610fd60c5ae463c958cba3ea47f3fdc4b6d5a7de46f4e456c51015fd7405d9c0f6cacb34c1a4924e9bc8d3fc38975942
+  metadata.gz: 97a299f33af0fc1e13b9f4d72559b4117933d87929d214567318338f30fd5ee406fa89e78853a8bcb3e140ebe669ce1be25a2f0fe1d7d0bf98384d2b028f6d19
+  data.tar.gz: d1ef6021e2247d138f109f51e99bc88ef4d2f6da2a690cbdd967c3178689e7280844b3cd2ae332185f6991eab57cef4ab49fa2f093dd6c0d08c34bc743ef13e4

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: x86-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