diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 21:08:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-16 21:08:46 +0300 |
| commit | aa0f0e992153e84e1cdec8a1c7310d5eb93a9f8f (patch) | |
| tree | 4a662bc77fb43e1d1deec78cc7a95d911c0da1c5 /lib/gitlab/sidekiq_middleware.rb | |
| parent | d47f9d2304dbc3a23bba7fe7a5cd07218eeb41cd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_middleware.rb')
| -rw-r--r-- | lib/gitlab/sidekiq_middleware.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_middleware.rb b/lib/gitlab/sidekiq_middleware.rb index 4893cbc1f45..3dda244233f 100644 --- a/lib/gitlab/sidekiq_middleware.rb +++ b/lib/gitlab/sidekiq_middleware.rb @@ -10,7 +10,7 @@ module Gitlab def self.server_configurator(metrics: true, arguments_logger: true, memory_killer: true, request_store: true) lambda do |chain| chain.add Gitlab::SidekiqMiddleware::Monitor - chain.add Gitlab::SidekiqMiddleware::Metrics if metrics + chain.add Gitlab::SidekiqMiddleware::ServerMetrics if metrics chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if arguments_logger chain.add Gitlab::SidekiqMiddleware::MemoryKiller if memory_killer chain.add Gitlab::SidekiqMiddleware::RequestStoreMiddleware if request_store @@ -27,6 +27,7 @@ module Gitlab def self.client_configurator lambda do |chain| chain.add Gitlab::SidekiqStatus::ClientMiddleware + chain.add Gitlab::SidekiqMiddleware::ClientMetrics chain.add Labkit::Middleware::Sidekiq::Client end end |