diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-10-04 16:58:25 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-10-04 16:58:25 +0000 |
| commit | 1973d0c183218e7ca826d627eaea5ce91a17bed3 (patch) | |
| tree | 31f823cb61a7b1e43ba17a3c4fabb30485369b48 /config | |
| parent | 707148ebae4cdda42b2b0cc5f87a6aa49615728f (diff) | |
| parent | 34687cf05deadccdd6b4b321c71d276ee0e72f49 (diff) | |
| download | gitlab-ce-1973d0c183218e7ca826d627eaea5ce91a17bed3.tar.gz | |
Merge branch 'add_reliable_fetcher' into 'master'
Add reliable sidekiq fetcher
See merge request gitlab-org/gitlab-ce!21715
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sidekiq.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 6c1079faad1..bc6b7aed6aa 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -40,6 +40,10 @@ Sidekiq.configure_server do |config| ActiveRecord::Base.clear_all_connections! end + if Feature.enabled?(:gitlab_sidekiq_reliable_fetcher) + Sidekiq::ReliableFetcher.setup_reliable_fetch!(config) + 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) @@ -57,10 +61,10 @@ Sidekiq.configure_server do |config| Gitlab::SidekiqVersioning.install! - config = Gitlab::Database.config || + db_config = Gitlab::Database.config || Rails.application.config.database_configuration[Rails.env] - config['pool'] = Sidekiq.options[:concurrency] - ActiveRecord::Base.establish_connection(config) + db_config['pool'] = Sidekiq.options[:concurrency] + ActiveRecord::Base.establish_connection(db_config) Rails.logger.debug("Connection Pool size for Sidekiq Server is now: #{ActiveRecord::Base.connection.pool.instance_variable_get('@size')}") # Avoid autoload issue such as 'Mail::Parsers::AddressStruct' |