nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix http request in Salmon

Browse source
This commit is contained in:
Maksim Pechnikov 2018-12-02 17:00:33 +03:00
parent ec34de0c1f
commit 97252a27d9
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/salmon/salmon.ex
View file

@ -158,14 +158,16 @@ def remote_users(%{data: %{"to" => to} = data}) do
end end
defp send_to_user(%{info: %{salmon: salmon}}, feed, poster) do defp send_to_user(%{info: %{salmon: salmon}}, feed, poster) do
with {:ok, %{status_code: code}} <- with {:ok, %{status: code}} <-
poster.( poster.(
salmon, salmon,
feed, feed,
[{"Content-Type", "application/magic-envelope+xml"}], [{"Content-Type", "application/magic-envelope+xml"}],
timeout: 10000, adapter: [
recv_timeout: 20000, timeout: 10000,
hackney: [pool: :default] recv_timeout: 20000,
pool: :default
]
) do ) do
Logger.debug(fn -> "Pushed to #{salmon}, code #{code}" end) Logger.debug(fn -> "Pushed to #{salmon}, code #{code}" end)
else else