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 /config | |
| parent | c787c1559e9e558b83e78354823eb54b9fe8c718 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/lograge.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb index 42c97e4aebd..e3601a9538e 100644 --- a/config/initializers/lograge.rb +++ b/config/initializers/lograge.rb @@ -5,7 +5,7 @@ unless Gitlab::Runtime.sidekiq? Rails.application.configure do config.lograge.enabled = true # Store the lograge JSON files in a separate file - config.lograge.keep_original_rails_log = true + config.lograge.keep_original_rails_log = Gitlab::Utils.to_boolean(ENV.fetch('UNSTRUCTURED_RAILS_LOG', 'true')) # Don't use the Logstash formatter since this requires logstash-event, an # unmaintained gem that monkey patches `Time` config.lograge.formatter = Lograge::Formatters::Json.new |