Use shorter Redis key for dir backend config

rsc:db:username instead of rs_config:dir_backend:username
This commit is contained in:
Garret Alfert 2016-03-02 14:24:16 +01:00
parent ff25b40385
commit 067f4a1553
4 changed files with 9 additions and 9 deletions

View File

@ -537,7 +537,7 @@ module RemoteStorage
end end
def directory_backend(user) def directory_backend(user)
@directory_backend ||= redis.get("rs_config:dir_backend:#{user}") || "legacy" @directory_backend ||= redis.get("rsc:db:#{user}") || "legacy"
end end
def etag_for(body) def etag_for(body)

View File

@ -57,7 +57,7 @@ class Migrator
end end
def set_directory_backend(backend) def set_directory_backend(backend)
redis.set("rs_config:dir_backend:#{username}", backend) unless dry_run redis.set("rsc:db:#{username}", backend) unless dry_run
end end
def work_on_dir(directory, parent_directory) def work_on_dir(directory, parent_directory)

View File

@ -39,7 +39,7 @@ if app.settings.respond_to? :redis
end end
def purge_redis def purge_redis
redis.keys("rs_*").each do |key| redis.keys("rs*").each do |key|
redis.del key redis.del key
end end
end end

View File

@ -16,7 +16,7 @@ describe "App" do
before do before do
purge_redis purge_redis
redis.set "rs_config:dir_backend:phil", "new" redis.set "rsc:db:phil", "new"
end end
context "authorized" do context "authorized" do
@ -115,7 +115,7 @@ describe "App" do
describe "directory backend configuration" do describe "directory backend configuration" do
context "locked new backed" do context "locked new backed" do
before do before do
redis.set "rs_config:dir_backend:phil", "new-locked" redis.set "rsc:db:phil", "new-locked"
end end
it "responds with 503" do it "responds with 503" do
@ -130,7 +130,7 @@ describe "App" do
context "locked legacy backend" do context "locked legacy backend" do
before do before do
redis.set "rs_config:dir_backend:phil", "legacy-locked" redis.set "rsc:db:phil", "legacy-locked"
end end
it "responds with 503" do it "responds with 503" do
@ -150,7 +150,7 @@ describe "App" do
before do before do
purge_redis purge_redis
redis.set "rs_config:dir_backend:phil", "new" redis.set "rsc:db:phil", "new"
end end
context "authorized" do context "authorized" do
@ -239,7 +239,7 @@ describe "App" do
before do before do
purge_redis purge_redis
redis.set "rs_config:dir_backend:phil", "new" redis.set "rsc:db:phil", "new"
end end
context "authorized" do context "authorized" do
@ -318,7 +318,7 @@ describe "App" do
put "/phil/food/camaron", "yummi" put "/phil/food/camaron", "yummi"
end end
redis.set "rs_config:dir_backend:phil", "legacy" redis.set "rsc:db:phil", "legacy"
end end
it "serves directory listing from Swift backend" do it "serves directory listing from Swift backend" do