Merge branch 'rs-fix-admin-logs-timeout' into 'master'

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

See merge request !13751

3 files changed, 17 insertions, 16 deletions

diff --git a/app/controllers/admin/logs_controller.rb b/app/controllers/admin/logs_controller.rb
index b999018dde4..bdc4332ae69 100644
--- a/app/controllers/admin/logs_controller.rb
+++ b/app/controllers/admin/logs_controller.rb
@@ -1,2 +1,11 @@
 class Admin::LogsController < Admin::ApplicationController
+  def show
+    @loggers = [
+      Gitlab::AppLogger,
+      Gitlab::GitLogger,
+      Gitlab::EnvironmentLogger,
+      Gitlab::SidekiqLogger,
+      Gitlab::RepositoryCheckLogger
+    ]
+  end
 end
diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml
index 487f1cf5c4f..ee87f25a225 100644
--- a/app/views/admin/logs/show.html.haml
+++ b/app/views/admin/logs/show.html.haml
@@ -1,25 +1,21 @@
 - @no_container = true
 - page_title "Logs"
-- loggers = [Gitlab::GitLogger, Gitlab::AppLogger,
-             Gitlab::EnvironmentLogger, Gitlab::SidekiqLogger,
-             Gitlab::RepositoryCheckLogger]
 = render 'admin/monitoring/head'
 
 %div{ class: container_class }
   %ul.nav-links.log-tabs
-    - loggers.each do |klass|
-      %li{ class: active_when(klass == Gitlab::GitLogger) }>
-        = link_to klass::file_name, "##{klass::file_name_noext}",
-            'data-toggle' => 'tab'
+    - @loggers.each do |klass|
+      %li{ class: active_when(klass == @loggers.first) }>
+        = link_to klass.file_name, "##{klass.file_name_noext}", data: { toggle: 'tab' }
   .row-content-block
     To prevent performance issues admin logs output the last 2000 lines
   .tab-content
-    - loggers.each do |klass|
-      .tab-pane{ class: active_when(klass == Gitlab::GitLogger), id: klass::file_name_noext }
+    - @loggers.each do |klass|
+      .tab-pane{ class: active_when(klass == @loggers.first), id: klass.file_name_noext }
         .file-holder#README
           .js-file-title.file-title
             %i.fa.fa-file
-            = klass::file_name
+            = klass.file_name
             .pull-right
               = link_to '#', class: 'log-bottom' do
                 %i.fa.fa-arrow-down
diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
index 59b21149a9a..6bffd410ed0 100644
--- 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