Merge branch 'sh-sidekiq-logging-json' into 'master'
Enable JSON logs for Sidekiq by default See merge request gitlab-org/gitlab-ce!32842
This commit is contained in:
		
						commit
						c51c57d0c6
					
				|  | @ -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. | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue