fluentd 1.12.3 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63664b249be827ef09d4b9b96807e455481255742203898de8d5dd83b232707c
-  data.tar.gz: fe6020cec7c43a62d770b9e7a72040dee8220fc64c109365efafe6dbb3c0ea33
+  metadata.gz: 18ac12d4a5dd93864521dae3a8a7db37fbe3bcd385f80a394bd6ddb34ffa6541
+  data.tar.gz: 105bc856fdf9863e414da2147d53a849d418f6ba6810888eab023d28e2097035
 SHA512:
-  metadata.gz: 3507b87e4b8ab5744474b6ff2142f84aa5a7a889e5088ad18b6e436db68a385942b851f49c7de855495cddced9cc6b6128ff84003b7ba194a1011e98f4358ef2
-  data.tar.gz: db3bf1ba907a491d82b7b0dc136921d2950726264f38b4419d961f198aad2603a87f7b63a110fe730b312bc9950c6e2a61ed816ef5e653d80da84c0808fb36b3
+  metadata.gz: 16d72d0914ee5eb42ecb9e3957e791ddab88e1a32ed810785615470a0539eb01f0b91085167edac16937ec72b9352582ace8db3fc0adc06b64c3842111b16e3e
+  data.tar.gz: e928fc8ccaf35460e24b2157d95c3b2a076574fdd90801be94ff39fc86d92770f948425317aa8c1f192d826e190ce5e0abd5770bef922a8ed5e42c0494ca2c38

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: ruby
 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
@@ -932,7 +932,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