diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-02-28 23:35:22 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-02-28 23:35:22 +0000 |
| commit | 3b5ecd35ec79a45aa164ded3ae032a18b8f92324 (patch) | |
| tree | b271893ee5ef91271a44f6d23c14f5075223ae81 /config | |
| parent | 0a563cbf96e0dc18a8d05e741898c13785e79165 (diff) | |
| parent | ff431fe0762b4d590a1d307b1a6b3ab7268ff7df (diff) | |
| download | gitlab-ce-3b5ecd35ec79a45aa164ded3ae032a18b8f92324.tar.gz | |
Merge branch '40396-remove-unneeded-restart-code' into 'master'
Remove an obsolete workaround for GRPC unavailable errors
See merge request gitlab-org/gitlab-ce!25645
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sidekiq.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 69a60a65e77..4a8d72e37a5 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -22,7 +22,7 @@ Sidekiq.configure_server do |config| config.server_middleware do |chain| chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS'] && !enable_json_logs - chain.add Gitlab::SidekiqMiddleware::Shutdown + chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'] chain.add Gitlab::SidekiqMiddleware::RequestStoreMiddleware unless ENV['SIDEKIQ_REQUEST_STORE'] == '0' chain.add Gitlab::SidekiqMiddleware::BatchLoader chain.add Gitlab::SidekiqMiddleware::CorrelationLogger |