Change Redis key for container migration

This commit is contained in:
Garret Alfert 2016-09-02 16:41:36 +02:00
parent fdc819d53d
commit c79b86bff5

View File

@ -20,7 +20,7 @@ module RemoteStorage
def authorize_request(user, directory, token, listing=false) def authorize_request(user, directory, token, listing=false)
request_method = server.env["REQUEST_METHOD"] request_method = server.env["REQUEST_METHOD"]
if request_method.match(/PUT|DELETE/) && container_type(user) == "locked" if request_method.match(/PUT|DELETE/) && container_migration(user) == "in_progress"
server.halt 503, "Down for maintenance. Back soon!" server.halt 503, "Down for maintenance. Back soon!"
end end
@ -383,10 +383,10 @@ module RemoteStorage
end end
def container_url_for(user) def container_url_for(user)
if container_type(user) == "shared" if container_migration(user)
"#{base_url}/rs:documents:#{settings.environment.to_s}/#{user}"
else
user_container_url user_container_url
else
"#{base_url}/rs:documents:#{settings.environment.to_s}/#{user}"
end end
end end
@ -402,8 +402,8 @@ module RemoteStorage
"rs:#{settings.environment.to_s.chars.first}:#{user}" "rs:#{settings.environment.to_s.chars.first}:#{user}"
end end
def container_type(user) def container_migration(user)
redis.get("rs:container:#{user}") || "legacy" redis.get("rs:container_migration:#{user}")
end end
def default_headers def default_headers