Skip to content

Commit 1a5f2cc

Browse files
authored
Merge pull request #13346 from colinux/fix-connection-pool-pin
Tech: re-pin connection_pool < 3 pour ne pas tuer le scheduler Sidekiq
2 parents f97166b + 9553f71 commit 1a5f2cc

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ gem 'sentry-rails'
9797
gem 'sentry-ruby'
9898
gem 'sentry-sidekiq'
9999
gem 'sib-api-v3-sdk'
100+
# connection_pool 3.0 changed TimedStack#pop signature, which crashes the
101+
# Sidekiq::Scheduled::Poller thread (scheduled/retry jobs stop being enqueued).
102+
# Sidekiq must be >= 8.1 before bumping to connection_pool 3.x; keep < 3 until then.
103+
gem 'connection_pool', '< 3'
100104
gem 'sidekiq', '< 7.3' # 7.3 needs to migrate to sidekiq-cron 2.0
101105
gem 'sidekiq-cron', '< 2.0' # wait for a release without "keys command"
102106
gem 'siret_validator', github: "CodeursenLiberte/siret_validator", ref: "ba421bb"

Gemfile.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ GEM
218218
coercible (1.0.0)
219219
descendants_tracker (~> 0.0.1)
220220
concurrent-ruby (1.3.7)
221-
connection_pool (3.0.2)
221+
connection_pool (2.5.5)
222222
content_disposition (1.0.0)
223223
crack (1.0.0)
224224
bigdecimal
@@ -1041,6 +1041,7 @@ DEPENDENCIES
10411041
charlock_holmes
10421042
chartkick
10431043
clamav-client
1044+
connection_pool (< 3)
10441045
daemons
10451046
deep_cloneable
10461047
delayed_cron_job

0 commit comments

Comments
 (0)