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

Enable JSON logs for Sidekiq by default See merge request gitlab-org/gitlab-ce!32842
2019-09-09 23:03:31 +00:00 · 2019-09-09 23:03:31 +00:00 · c51c57d0c6
parent 8ce331c206 6ecdd49cf9
commit c51c57d0c6
1 changed files with 1 additions and 1 deletions
--- 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.