Commit c4965142 authored by nmilojevic1's avatar nmilojevic1

Addressed Maintainer feedback

parent 166458db
...@@ -16,7 +16,7 @@ GitLab uses [Redis](https://redis.io) for the following distinct purposes: ...@@ -16,7 +16,7 @@ GitLab uses [Redis](https://redis.io) for the following distinct purposes:
- To store CI trace chunks. - To store CI trace chunks.
- As a Pub/Sub queue backend for ActionCable. - As a Pub/Sub queue backend for ActionCable.
- Rate limiting state storage. - Rate limiting state storage.
- Sessions - Sessions.
In most environments (including the GDK), all of these point to the same In most environments (including the GDK), all of these point to the same
Redis instance. Redis instance.
......
...@@ -30,6 +30,6 @@ module RedisHelpers ...@@ -30,6 +30,6 @@ module RedisHelpers
# Usage: session state # Usage: session state
def redis_sessions_cleanup! def redis_sessions_cleanup!
Gitlab::Redis::Session.with(&:flushdb) Gitlab::Redis::Sessions.with(&:flushdb)
end end
end end
...@@ -5,10 +5,10 @@ require 'spec_helper' ...@@ -5,10 +5,10 @@ require 'spec_helper'
RSpec.shared_examples "redis_new_instance_shared_examples" do |name, fallback_class| RSpec.shared_examples "redis_new_instance_shared_examples" do |name, fallback_class|
let(:instance_specific_config_file) { "config/redis.#{name}.yml" } let(:instance_specific_config_file) { "config/redis.#{name}.yml" }
let(:environment_config_file_name) { "GITLAB_REDIS_#{name.upcase}_CONFIG_FILE" } let(:environment_config_file_name) { "GITLAB_REDIS_#{name.upcase}_CONFIG_FILE" }
let(:shared_state_config_file) { nil } let(:fallback_config_file) { nil }
before do before do
allow(fallback_class).to receive(:config_file_name).and_return(shared_state_config_file) allow(fallback_class).to receive(:config_file_name).and_return(fallback_config_file)
end end
include_examples "redis_shared_examples" include_examples "redis_shared_examples"
...@@ -44,10 +44,10 @@ RSpec.shared_examples "redis_new_instance_shared_examples" do |name, fallback_cl ...@@ -44,10 +44,10 @@ RSpec.shared_examples "redis_new_instance_shared_examples" do |name, fallback_cl
it { expect(subject).to eq('global override') } it { expect(subject).to eq('global override') }
context 'and SharedState has a different config file' do context "and #{fallback_class.name.demodulize} has a different config file" do
let(:shared_state_config_file) { 'shared state config file' } let(:fallback_config_file) { 'fallback config file' }
it { expect(subject).to eq('shared state config file') } it { expect(subject).to eq('fallback config file') }
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment