diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-09-09 23:03:31 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-09-09 23:03:31 +0000 |
| commit | c51c57d0c65da6164e3e904c9b330db86b8d7bbc (patch) | |
| tree | 39fe4c392cb7e89122348121f0445ebbb10c8b92 | |
| parent | 8ce331c206dd97bbfc672a554afb8bc0f8039983 (diff) | |
| parent | 6ecdd49cf93a53651289d12164953174ada953c8 (diff) | |
| download | gitlab-ce-c51c57d0c65da6164e3e904c9b330db86b8d7bbc.tar.gz | |
Merge branch 'sh-sidekiq-logging-json' into 'master'
Enable JSON logs for Sidekiq by default
See merge request gitlab-org/gitlab-ce!32842
| -rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index aa7c2d343a8..87159b695f9 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -342,7 +342,7 @@ production: &base ## Sidekiq sidekiq: - log_format: default # (json is also supported) + log_format: json # (default is the original format) ## Auxiliary jobs # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc. |