diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-02-28 14:45:20 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-28 14:45:20 +0000 |
| commit | ff431fe0762b4d590a1d307b1a6b3ab7268ff7df (patch) | |
| tree | 64ba9c952f7f299b5251a553592c4f1df3d3e82c /config/initializers | |
| parent | 7d1216016cfc64e35955249e39c46615e2dbdf93 (diff) | |
| download | gitlab-ce-ff431fe0762b4d590a1d307b1a6b3ab7268ff7df.tar.gz | |
Revert "Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed"
This reverts commit 006753110a462e62f549cdf3c410e73eed068dbf.
Diffstat (limited to 'config/initializers')
| -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 |