diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2018-12-02 17:00:33 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2018-12-04 14:04:06 +0300 |
commit | 97252a27d9bdde3483cc6d676c0c61150d2174ad (patch) | |
tree | 7b05eda22bc96e3f6db92cd444f406d03e401cfa /lib | |
parent | ec34de0c1fd58942c8ecefddef92696750b70420 (diff) | |
download | pleroma-97252a27d9bdde3483cc6d676c0c61150d2174ad.tar.gz |
fix http request in Salmon
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/salmon/salmon.ex | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex index b98ece6c9..97251c05e 100644 --- a/lib/pleroma/web/salmon/salmon.ex +++ b/lib/pleroma/web/salmon/salmon.ex @@ -158,14 +158,16 @@ defmodule Pleroma.Web.Salmon do end defp send_to_user(%{info: %{salmon: salmon}}, feed, poster) do - with {:ok, %{status_code: code}} <- + with {:ok, %{status: code}} <- poster.( salmon, feed, [{"Content-Type", "application/magic-envelope+xml"}], - timeout: 10000, - recv_timeout: 20000, - hackney: [pool: :default] + adapter: [ + timeout: 10000, + recv_timeout: 20000, + pool: :default + ] ) do Logger.debug(fn -> "Pushed to #{salmon}, code #{code}" end) else |