Fix a potential timeout in `Gitlab::Logger.read_latest`

If this method was called for a file that didn't exist, we attempted to first `build` it. But if the file wasn't writeable, such as a symlink pointing to an unmounted filesystem, the method would just hang and eventually timeout. Further, this was entirely pointless since we were creating a file and then shelling out to `tail`, eventually returning an empty Array. Now we just skip building it and return the empty Array straight away.

Fix a potential timeout in `Gitlab::Logger.read_latest`
4598e0c3 · Robert Speicher · 7965f4e7 · 4598e0c3
Commit 4598e0c3 authored Aug 22, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

logger.rb lib/gitlab/logger.rb +2 -6

No files found.
--- a/lib/gitlab/logger.rb
+++ b/lib/gitlab/logger.rb
@@ -14,13 +14,9 @@ module Gitlab

    def self.read_latest
      path = Rails.root.join("log", file_name)
-      self.build unless File.exist?(path)
-      tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
-      tail_output.split("\n")
-    end

-    def self.read_latest_for(filename)
-      path = Rails.root.join("log", filename)
+      return [] unless File.readable?(path)
+
      tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
      tail_output.split("\n")
    end