Merge pull request #788 from dwoo4dwoo/reduce_tail_opens

in_tail: avoid unnecessary open()s
fluent · Feb 12, 2016 · 64c5d0c · 64c5d0c
2 parents a65118e + 2253719
commit 64c5d0c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lib/fluent/plugin/in_tail.rb b/lib/fluent/plugin/in_tail.rb
@@ -586,8 +586,7 @@ def initialize(path, log, &on_rotate)
 
         def on_notify
           begin
-            io = FileWrapper.open(@path)
-            stat = io.stat
+            stat = FileWrapper.stat(@path)
             inode = stat.ino
             fsize = stat.size
           rescue Errno::ENOENT
@@ -599,13 +598,14 @@ def on_notify
           begin
             if @inode != inode || fsize < @fsize
               # rotated or truncated
+              begin
+                io = FileWrapper.open(@path)
+              rescue Errno::ENOENT
+              end
               @on_rotate.call(io)
-              io = nil
             end
             @inode = inode
             @fsize = fsize
-          ensure
-            io.close if io
           end
 
         rescue