diff options
| author | Hakaba Hitoyo <hakabahitoyo@example.com> | 2018-11-15 14:04:09 +0900 |
|---|---|---|
| committer | Hakaba Hitoyo <hakabahitoyo@example.com> | 2018-11-15 14:04:09 +0900 |
| commit | 5c8b8f6cb7212bd202924b535cd2a263416e78d4 (patch) | |
| tree | 07ad2b2dd44189ae14a1ff44ff5a98013143866b /lib/pleroma/uploaders/swift/swift.ex | |
| parent | 3484f687958f57ea5ce749135f78517ff12849d7 (diff) | |
| parent | cc45797f4e1765f5123c058166f6032c6a6556a0 (diff) | |
| download | pleroma-5c8b8f6cb7212bd202924b535cd2a263416e78d4.tar.gz | |
Merge remote-tracking branch 'official/develop' into develop
Diffstat (limited to 'lib/pleroma/uploaders/swift/swift.ex')
| -rw-r--r-- | lib/pleroma/uploaders/swift/swift.ex | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/pleroma/uploaders/swift/swift.ex b/lib/pleroma/uploaders/swift/swift.ex index 819dfebda..fa08ca966 100644 --- a/lib/pleroma/uploaders/swift/swift.ex +++ b/lib/pleroma/uploaders/swift/swift.ex @@ -1,17 +1,15 @@ defmodule Pleroma.Uploaders.Swift.Client do use HTTPoison.Base - @settings Application.get_env(:pleroma, Pleroma.Uploaders.Swift) - def process_url(url) do Enum.join( - [Keyword.fetch!(@settings, :storage_url), url], + [Pleroma.Config.get!([Pleroma.Uploaders.Swift, :storage_url]), url], "/" ) end def upload_file(filename, body, content_type) do - object_url = Keyword.fetch!(@settings, :object_url) + object_url = Pleroma.Config.get!([Pleroma.Uploaders.Swift, :object_url]) token = Pleroma.Uploaders.Swift.Keystone.get_token() case put("#{filename}", body, "X-Auth-Token": token, "Content-Type": content_type) do |