diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-19 23:18:09 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-19 23:18:09 +0000 |
commit | 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde (patch) | |
tree | dc4d20fe6064752c0bd323187252c77e0a89144b /app/models/active_session.rb | |
parent | 9868dae7fc0655bd7ce4a6887d4e6d487690eeed (diff) | |
download | gitlab-ce-6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde.tar.gz |
Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42
Diffstat (limited to 'app/models/active_session.rb')
-rw-r--r-- | app/models/active_session.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/active_session.rb b/app/models/active_session.rb index 9f634e70ff4..7dbc95c251b 100644 --- a/app/models/active_session.rb +++ b/app/models/active_session.rb @@ -83,21 +83,21 @@ class ActiveSession is_impersonated: request.session[:impersonator_id].present? ) - redis.pipelined do - redis.setex( + redis.pipelined do |pipeline| + pipeline.setex( key_name(user.id, session_private_id), expiry, active_user_session.dump ) # Deprecated legacy format - temporary to support mixed deployments - redis.setex( + pipeline.setex( key_name_v1(user.id, session_private_id), expiry, Marshal.dump(active_user_session) ) - redis.sadd( + pipeline.sadd( lookup_key_name(user.id), session_private_id ) |