diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-25 15:10:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-25 15:10:30 +0300 |
| commit | 93553d9dc0baeb34a2cf7ecf4c99bb4fcc18f30f (patch) | |
| tree | d9d69ac646dea5ac4ec94998315c35ce50cea988 /config | |
| parent | fde9498dabb9cf80ac6a621c053d97fd31b481fc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index bbdbd68a78b..07be2bbf57b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -510,7 +510,7 @@ production: &base ## Sidekiq sidekiq: - log_format: json # (default is the original format) + log_format: json # (text is the original format) # An array of tuples indicating the rules for re-routing a worker to a # desirable queue before scheduling. For example: # routing_rules: diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 9eb58ad01af..dea4ed6b160 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -34,7 +34,7 @@ unless Gitlab::Utils.to_boolean(ENV['SIDEKIQ_ENQUEUE_NON_NAMESPACED']) queues_config_hash[:namespace] = Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE end -enable_json_logs = Gitlab.config.sidekiq.log_format == 'json' +enable_json_logs = Gitlab.config.sidekiq.log_format != 'text' Sidekiq.configure_server do |config| config[:strict] = false |