DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10520 from colinux/fix-kredis-default-connection

Browse source 
Tech (kredis): configure la connection `shared` qui est celle par défaut
This commit is contained in:
Colin Darie 2024-06-14 10:08:32 +00:00 committed by GitHub
commit 234d337e49
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/concerns/lockable_concern.rb
View file

@ -3,7 +3,7 @@ module LockableConcern
included do
def lock_action(key)
lock = Kredis.flag(key, config: :volatile)
lock = Kredis.flag(key)
head :locked and return if lock.marked?
lock.mark(expires_in: 10.seconds)

6
config/initializers/kredis.rb
View file

@ -1,7 +1,7 @@
redis_volatile_options = {
redis_shared_options = {
url: ENV['REDIS_CACHE_URL'], # will fallback to default redis url if empty, and won't fail if there is no redis server
ssl: ENV['REDIS_CACHE_SSL'] == 'enabled'
}
redis_volatile_options[:ssl_params] = { verify_mode: OpenSSL::SSL::VERIFY_NONE } if ENV['REDIS_CACHE_SSL_VERIFY_NONE'] == 'enabled'
redis_shared_options[:ssl_params] = { verify_mode: OpenSSL::SSL::VERIFY_NONE } if ENV['REDIS_CACHE_SSL_VERIFY_NONE'] == 'enabled'
Kredis::Connections.connections[:volatile] = Redis.new(redis_volatile_options)
Kredis::Connections.connections[:shared] = Redis.new(redis_shared_options)

4
spec/controllers/concerns/lockable_concern_spec.rb
View file

@ -27,7 +27,7 @@ describe LockableConcern, type: :controller do
context 'when there are concurrent requests' do
it 'aborts the second request' do
# Simulating the first request acquiring the lock
Kredis.flag(lock_key, config: :volatile).mark(expires_in: 3.seconds)
Kredis.flag(lock_key).mark(expires_in: 3.seconds)
# Making the second request
expect(subject).to have_http_status(:locked)
@ -36,7 +36,7 @@ describe LockableConcern, type: :controller do
context 'when the lock expires' do
it 'allows another request after expiration' do
Kredis.flag(lock_key, config: :volatile).mark(expires_in: 0.001.seconds)
Kredis.flag(lock_key).mark(expires_in: 0.001.seconds)
sleep 0.002
expect(subject).to have_http_status(:ok)