aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/uploaders/swift/swift.ex
diff options
context:
space:
mode:
authorThurloat <thurloat@gmail.com>2018-08-29 22:07:28 -0300
committerThurloat <thurloat@gmail.com>2018-08-29 22:07:28 -0300
commitaf01f0196a43454728f6e0ca8b9b8be208743251 (patch)
tree69b055a949545e75c6fe7e2a08d1185ea4d46b14 /lib/pleroma/uploaders/swift/swift.ex
parentd424e9fa5f3d0d1ff9e416f6bf548e0e8bb02361 (diff)
downloadpleroma-af01f0196a43454728f6e0ca8b9b8be208743251.tar.gz
Add backend failure handling with :ok | :error so the uploader can handle it.
defaulting to :ok, since that's the currently level of error handling.
Diffstat (limited to 'lib/pleroma/uploaders/swift/swift.ex')
-rw-r--r--lib/pleroma/uploaders/swift/swift.ex10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/pleroma/uploaders/swift/swift.ex b/lib/pleroma/uploaders/swift/swift.ex
index 4f45255f1..819dfebda 100644
--- a/lib/pleroma/uploaders/swift/swift.ex
+++ b/lib/pleroma/uploaders/swift/swift.ex
@@ -11,20 +11,18 @@ defmodule Pleroma.Uploaders.Swift.Client do
end
def upload_file(filename, body, content_type) do
+ object_url = Keyword.fetch!(@settings, :object_url)
token = Pleroma.Uploaders.Swift.Keystone.get_token()
case put("#{filename}", body, "X-Auth-Token": token, "Content-Type": content_type) do
{:ok, %HTTPoison.Response{status_code: 201}} ->
- # lgtm
- ""
+ {:ok, "#{object_url}/#{filename}"}
{:ok, %HTTPoison.Response{status_code: 401}} ->
- # bad token
- ""
+ {:error, "Unauthorized, Bad Token"}
{:error, _} ->
- # bad news
- ""
+ {:error, "Swift Upload Error"}
end
end
end