diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 00:07:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 00:07:57 +0300 |
| commit | 5aa96ff14229dba7e35f213354963febf3ad2833 (patch) | |
| tree | 544f3233c05f7f1aa723ea9f13036f2f45d91745 /config/initializers | |
| parent | 7ebcead8cfd2edb810dd0cbda816b6cfbd170fe3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/sidekiq.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 88e198116a0..fa4fc2d2c7b 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -108,6 +108,11 @@ end Sidekiq.configure_client do |config| config.redis = queues_config_hash + # We only need to do this for other clients. If Sidekiq-server is the + # client scheduling jobs, we have access to the regular sidekiq logger that + # writes to STDOUT + Sidekiq.logger = Gitlab::SidekiqLogging::ClientLogger.build + Sidekiq.logger.formatter = Gitlab::SidekiqLogging::JSONFormatter.new if enable_json_logs config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator) end |