diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-12-17 20:08:08 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-18 19:40:34 +0000 |
| commit | 7da68ab3f22412272596b0a87c7f69bcb633f731 (patch) | |
| tree | 20e91acd6b26cf97b78ea106bc41e0a32251ce68 | |
| parent | 2c6aa9e84f2028f85681d4479f2ea79da70bbd20 (diff) | |
| download | gitlab-ce-7da68ab3f22412272596b0a87c7f69bcb633f731.tar.gz | |
Merge branch 'update_reliable_fetcher' into 'master'
Bump gitlab-reliable-fetcher gem
See merge request gitlab-org/gitlab-ce!23854
(cherry picked from commit 37da7f2382fe1cfa226402b206086998a4484274)
aaa51fe9 Bump gitlab-reliable-fetcher gem
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 4 |
3 files changed, 6 insertions, 4 deletions
@@ -181,6 +181,7 @@ gem 'acts-as-taggable-on', '~> 5.0' gem 'sidekiq', '~> 5.2.1' gem 'sidekiq-cron', '~> 0.6.0' gem 'redis-namespace', '~> 1.6.0' +gem 'gitlab-sidekiq-fetcher', '~> 0.1.0', require: 'sidekiq-reliable-fetch' # Cron Parser gem 'rufus-scheduler', '~> 3.4' @@ -310,7 +311,6 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch' # Metrics group :metrics do diff --git a/Gemfile.lock b/Gemfile.lock index 430025c7bde..7bc8fdbcb09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,7 +280,7 @@ GEM gitlab-default_value_for (3.1.1) activerecord (>= 3.2.0, < 6.0) gitlab-markup (1.6.5) - gitlab-sidekiq-fetcher (0.3.0) + gitlab-sidekiq-fetcher (0.1.0) sidekiq (~> 5) gitlab-styles (2.4.1) rubocop (~> 0.54.0) @@ -1011,7 +1011,7 @@ DEPENDENCIES github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) - gitlab-sidekiq-fetcher + gitlab-sidekiq-fetcher (~> 0.1.0) gitlab-styles (~> 2.4) gitlab_omniauth-ldap (~> 2.0.4) gon (~> 6.2) diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 6aba6c7c21d..be4183f39be 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -42,7 +42,9 @@ Sidekiq.configure_server do |config| end if Feature::FlipperFeature.table_exists? && Feature.enabled?(:gitlab_sidekiq_reliable_fetcher) - Sidekiq::ReliableFetcher.setup_reliable_fetch!(config) + # By default we're going to use Semi Reliable Fetch + config.options[:semi_reliable_fetch] = Feature.enabled?(:gitlab_sidekiq_enable_semi_reliable_fetcher, default_enabled: true) + Sidekiq::ReliableFetch.setup_reliable_fetch!(config) end # Sidekiq-cron: load recurring jobs from gitlab.yml |