diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-03-08 05:00:53 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-03-08 05:00:53 +0300 |
| commit | e17bc3afc565bd13aa77380b2926fbae17ecf94f (patch) | |
| tree | 3b087e23a704300e46ce942c2866a9918bac8c3a | |
| parent | 99b9fbb9e64a7d935a84f705e47cfbcafd464d48 (diff) | |
| parent | fb697e69f209ce4a9c3d8837797ef5a2a0083596 (diff) | |
Merge branch 'clear-connections-before-starting-sidekiq' into 'master'
Clear AR connections before starting Sidekiq
Closes gitlab-com/infrastructure#1139
See merge request !9773
| -rw-r--r-- | changelogs/unreleased/clear-connections-before-starting-sidekiq.yml | 4 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/clear-connections-before-starting-sidekiq.yml b/changelogs/unreleased/clear-connections-before-starting-sidekiq.yml new file mode 100644 index 00000000000..8778fac6e9d --- /dev/null +++ b/changelogs/unreleased/clear-connections-before-starting-sidekiq.yml @@ -0,0 +1,4 @@ +--- +title: Clear ActiveRecord connections before starting Sidekiq +merge_request: +author: diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 0c4516b70f0..2b018c68703 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -19,6 +19,12 @@ Sidekiq.configure_server do |config| chain.add Gitlab::SidekiqStatus::ClientMiddleware end + config.on :startup do + # Clear any connections that might have been obtained before starting + # Sidekiq (e.g. in an initializer). + ActiveRecord::Base.clear_all_connections! + end + # Sidekiq-cron: load recurring jobs from gitlab.yml # UGLY Hack to get nested hash from settingslogic cron_jobs = JSON.parse(Gitlab.config.cron_jobs.to_json) |