diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-14 00:10:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-14 00:10:04 +0300 |
commit | 3825437c53474e3d6f3a7d82ef4f26583212531e (patch) | |
tree | 1bb207713ff4e28c10a9a9e3f7c9d3e509001733 /lib/gitlab/app_logger.rb | |
parent | c787c1559e9e558b83e78354823eb54b9fe8c718 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/app_logger.rb')
-rw-r--r-- | lib/gitlab/app_logger.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/app_logger.rb b/lib/gitlab/app_logger.rb index 3f5e9adf925..a39e7f31886 100644 --- a/lib/gitlab/app_logger.rb +++ b/lib/gitlab/app_logger.rb @@ -5,7 +5,11 @@ module Gitlab LOGGERS = [Gitlab::AppTextLogger, Gitlab::AppJsonLogger].freeze def self.loggers - LOGGERS + if Gitlab::Utils.to_boolean(ENV.fetch('UNSTRUCTURED_RAILS_LOG', 'true')) + LOGGERS + else + [Gitlab::AppJsonLogger] + end end def self.primary_logger |