Merge pull request #1540 from iantalarico/tail-dont-error-dirs

Do not warn that directories are unreadable in the in_tail plugin.
fluent · Apr 12, 2017 · e183496 · e183496
2 parents 1dc7ff8 + a01a7e2
commit e183496
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/fluent/plugin/in_tail.rb b/lib/fluent/plugin/in_tail.rb
@@ -189,14 +189,17 @@ def expand_paths
         path = date.strftime(path)
         if path.include?('*')
           paths += Dir.glob(path).select { |p|
-            if File.readable?(p) && !File.directory?(p)
+            is_file = !File.directory?(p)
+            if File.readable?(p) && is_file
               if @limit_recently_modified && File.mtime(p) < (date - @limit_recently_modified)
                 false
               else
                 true
               end
             else
-              log.warn "#{p} unreadable. It is excluded and would be examined next time."
+              if is_file
+                log.warn "#{p} unreadable. It is excluded and would be examined next time."
+              end
               false
             end
           }