Commit c51c57d0 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'sh-sidekiq-logging-json' into 'master'

Enable JSON logs for Sidekiq by default

See merge request gitlab-org/gitlab-ce!32842
parents 8ce331c2 6ecdd49c
...@@ -342,7 +342,7 @@ production: &base ...@@ -342,7 +342,7 @@ production: &base
## Sidekiq ## Sidekiq
sidekiq: sidekiq:
log_format: default # (json is also supported) log_format: json # (default is the original format)
## Auxiliary jobs ## Auxiliary jobs
# Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc. # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment