bolshakov
diff --git a/Collapse file
‎lib/stoplight/infrastructure/storage/fail_safe/state.rb‎
Copy file name to clipboardExpand all lines: lib/stoplight/infrastructure/storage/fail_safe/state.rb
+3-2Lines changed: 3 additions & 2 deletions b/Collapse file
‎lib/stoplight/infrastructure/storage/fail_safe/state.rb‎
Copy file name to clipboardExpand all lines: lib/stoplight/infrastructure/storage/fail_safe/state.rb
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/Collapse file
‎lib/stoplight/infrastructure/storage/memory/state.rb‎
Copy file name to clipboardExpand all lines: lib/stoplight/infrastructure/storage/memory/state.rb
+5-5Lines changed: 5 additions & 5 deletions b/Collapse file
‎lib/stoplight/infrastructure/storage/memory/state.rb‎
Copy file name to clipboardExpand all lines: lib/stoplight/infrastructure/storage/memory/state.rb
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/Collapse file
‎lib/stoplight/wiring/system/light_builder.rb‎
Copy file name to clipboardExpand all lines: lib/stoplight/wiring/system/light_builder.rb
+25-1Lines changed: 25 additions & 1 deletion b/Collapse file
‎lib/stoplight/wiring/system/light_builder.rb‎
Copy file name to clipboardExpand all lines: lib/stoplight/wiring/system/light_builder.rb
+25-1Lines changed: 25 additions & 1 deletion
@@ -26,9 +26,9 @@ class State < Domain::Storage::State
           #   @return [Stoplight::Light] The circuit breaker used to handle store failures.
           private attr_reader :circuit_breaker
 
-          # @param primary_store [Stoplight::Domain::Storage::RecoveryLock]
+          # @param primary_store [Stoplight::Domain::Storage::State]
           # @param error_notifier [Proc]
-          # @param failover_store [Stoplight::Domain::Storage::RecoveryLock]
+          # @param failover_store [Stoplight::Domain::Storage::State]
           # @param circuit_breaker [Stoplight::Domain::Light]
           def initialize(primary_store:, error_notifier:, failover_store:, circuit_breaker:)
             @primary_store = primary_store
@@ -45,6 +45,7 @@ def set_state(state)
             end
           end
 
+          # @return [Stoplight::Domain::StateSnapshot]
           def state_snapshot
             circuit_breaker.run(fallback { failover_store.state_snapshot }) do
               primary_store.state_snapshot
 
@@ -30,14 +30,14 @@ module Memory
         # @see Stoplight::Domain::Storage::State for the interface contract
         #
         class State < Domain::Storage::State
-          # @!attribute recovered_at
-          #   @return [Time, nil]
-          private attr_accessor :recovered_at
-
           # @!attribute locked_state
           #   @return [String]
           private attr_accessor :locked_state
 
+          # @!attribute recovered_at
+          #   @return [Time, nil]
+          private attr_accessor :recovered_at
+
           # @!attribute recovery_scheduled_after
           #   @return [Time, nil]
           private attr_accessor :recovery_scheduled_after
@@ -72,7 +72,7 @@ def initialize(clock:, cool_off_time:)
           end
 
           # @param state [String]
-          # @return [void]
+          # @return [String]
           def set_state(state)
             mutex.synchronize do
               self.locked_state = state
 
@@ -5,18 +5,42 @@ module Wiring
     class System
       class LightBuilder < Wiring::LightBuilder
         private attr_reader :system
+        private attr_reader :clock
 
         def initialize(system, settings)
           @system = system
+          @clock = Infrastructure::SystemClock.new
 
           super(settings)
         end
 
-        def key_space = Infrastructure::Storage::Redis::KeySpace.build(
+        def key_space = @key_space ||= Infrastructure::Storage::Redis::KeySpace.build(
           system_name: system.name,
           light_name: config.name
         )
 
+        def cool_off_time = config.cool_off_time
+
+        private def state_store
+          @state_store ||= case data_store_config
+          in Stoplight::DataStore::Memory
+            Infrastructure::Storage::Memory::State.new(clock:, cool_off_time:)
+          in Stoplight::DataStore::Redis
+            Infrastructure::Storage::FailSafe::State.new(
+              primary_store: Infrastructure::Storage::Redis::State.new(
+                redis: data_store_config.redis,
+                scripting:,
+                key_space:,
+                cool_off_time:,
+                clock:
+              ),
+              error_notifier:,
+              failover_store: Infrastructure::Storage::Memory::State.new(clock:, cool_off_time:),
+              circuit_breaker: failover_system.light("redis")
+            )
+          end
+        end
+
         def failover_system = @failover_system ||= Stoplight.__stoplight__system("failover-#{system.name}")
       end
     end