5apps/liquor-cabinet
5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Remove container migration checks

Browse Source
This commit is contained in:
Garret Alfert 2016-09-12 11:49:23 +02:00
parent d81a4b8314
commit 35abddc4ea
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/remote_storage/swift.rb
View File

@ -20,10 +20,6 @@ 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_migration(user) == "in_progress"
server.halt 503, "Down for maintenance. Back soon!"
end
if directory.split("/").first == "public" if directory.split("/").first == "public"
return true if ["GET", "HEAD"].include?(request_method) && !listing return true if ["GET", "HEAD"].include?(request_method) && !listing
end end
@ -383,12 +379,8 @@ module RemoteStorage
end end
def container_url_for(user) def container_url_for(user)
if container_migration(user)
"#{base_url}/rs:#{settings.environment.to_s.chars.first}:#{user}"
else
"#{base_url}/rs:documents:#{settings.environment.to_s}/#{user}" "#{base_url}/rs:documents:#{settings.environment.to_s}/#{user}"
end end
end
def url_for_key(user, directory, key) def url_for_key(user, directory, key)
File.join [container_url_for(user), escape(directory), escape(key)].compact File.join [container_url_for(user), escape(directory), escape(key)].compact
@ -398,10 +390,6 @@ module RemoteStorage
@base_url ||= settings.swift["host"] @base_url ||= settings.swift["host"]
end end
def container_migration(user)
redis.hget("rs:container_migration", user)
end
def default_headers def default_headers
{"x-auth-token" => swift_token} {"x-auth-token" => swift_token}
end end