diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-03-04 21:05:47 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-03-04 21:05:47 +0300 |
| commit | 5c80bbb33c12490bc5fa711642a40fc16bdb79a4 (patch) | |
| tree | 37469f16101018bb3fe1eb3728257fac6425da03 /config | |
| parent | 088128e621d0a7d48e89e738348a4ec57d8a0e36 (diff) | |
| parent | f0c52df5e540e825be0babd04cc557f3f40cf1c6 (diff) | |
Merge branch '40396-sidekiq-in-process-group' into 'master'
sidekiq: terminate child processes at shutdown
See merge request gitlab-org/gitlab-ce!25669
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sidekiq.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 4a8d72e37a5..2e4aa9c1053 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -77,6 +77,9 @@ Sidekiq.configure_server do |config| # Avoid autoload issue such as 'Mail::Parsers::AddressStruct' # https://github.com/mikel/mail/issues/912#issuecomment-214850355 Mail.eager_autoload! + + # Ensure the whole process group is terminated if possible + Gitlab::SidekiqSignals.install!(Sidekiq::CLI::SIGNAL_HANDLERS) end Sidekiq.configure_client do |config| |