diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-23 11:55:15 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-23 11:55:15 +0300 |
| commit | 72b5d95489040649348b678c4aca1a7a0ba1d8a5 (patch) | |
| tree | 326f0b006317892abd06652d1014615382d1fce7 /app/controllers | |
| parent | 08c07ad145eeac455536a91ca35f183dbc67c9a6 (diff) | |
| parent | e288afec9ccd85fb444ec11d5359a17f8c657f06 (diff) | |
Merge branch 'rs-fix-admin-logs-timeout' into 'master'
Fix a potential timeout in `Gitlab::Logger.read_latest`
See merge request !13751
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/logs_controller.rb | 9 |
1 files changed, 9 insertions, 0 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 |