From edaa33dee2ff2f7ea3fac488d41558eb5f86d68c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 20 Jan 2022 09:16:11 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-7-stable-ee

---
 lib/gitlab/redis/sessions.rb | 36 +++---------------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

(limited to 'lib/gitlab/redis/sessions.rb')

diff --git a/lib/gitlab/redis/sessions.rb b/lib/gitlab/redis/sessions.rb
index c547828d907..ddcfdf6e798 100644
--- a/lib/gitlab/redis/sessions.rb
+++ b/lib/gitlab/redis/sessions.rb
@@ -9,39 +9,9 @@ module Gitlab
       IP_SESSIONS_LOOKUP_NAMESPACE = 'session:lookup:ip:gitlab2'
       OTP_SESSIONS_NAMESPACE = 'session:otp'
 
-      class << self
-        # The data we store on Sessions used to be stored on SharedState.
-        def config_fallback
-          SharedState
-        end
-
-        private
-
-        def redis
-          # Don't use multistore if redis.sessions configuration is not provided
-          return super if config_fallback?
-
-          primary_store = ::Redis.new(params)
-          secondary_store = ::Redis.new(config_fallback.params)
-
-          MultiStore.new(primary_store, secondary_store, store_name)
-        end
-      end
-
-      def store(extras = {})
-        # Don't use multistore if redis.sessions configuration is not provided
-        return super if self.class.config_fallback?
-
-        primary_store = create_redis_store(redis_store_options, extras)
-        secondary_store = create_redis_store(self.class.config_fallback.params, extras)
-
-        MultiStore.new(primary_store, secondary_store, self.class.store_name)
-      end
-
-      private
-
-      def create_redis_store(options, extras)
-        ::Redis::Store.new(options.merge(extras))
+      # The data we store on Sessions used to be stored on SharedState.
+      def self.config_fallback
+        SharedState
       end
     end
   end
-- 
cgit v1.2.1