moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Longer timeouts for outgoing federation.

This commit is contained in:
Roger Braun 2017-06-23 12:25:53 +02:00
parent 42633406b3
commit 6a184115a2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/salmon/salmon.ex
View File

@ -132,7 +132,7 @@ def remote_users(%{data: %{"to" => to}}) do
end end
defp send_to_user(%{info: %{"salmon" => salmon}}, feed, poster) do defp send_to_user(%{info: %{"salmon" => salmon}}, feed, poster) do
poster.(salmon, feed, [{"Content-Type", "application/magic-envelope+xml"}]) poster.(salmon, feed, [{"Content-Type", "application/magic-envelope+xml"}], timeout: 10000, recv_timeout: 20000)
end end
defp send_to_user(_,_,_), do: nil defp send_to_user(_,_,_), do: nil

6
lib/pleroma/web/websub/websub.ex
View File

@ -54,9 +54,9 @@ def publish(topic, user, activity) do
Task.start(fn -> Task.start(fn ->
with {:ok, %{status_code: code}} <- @httpoison.post(sub.callback, response, [ with {:ok, %{status_code: code}} <- @httpoison.post(sub.callback, response, [
{"Content-Type", "application/atom+xml"}, {"Content-Type", "application/atom+xml"},
{"X-Hub-Signature", "sha1=#{signature}"} {"X-Hub-Signature", "sha1=#{signature}"}
]) do ], timeout: 10000, recv_timeout: 20000) do
Logger.debug(fn -> "Pushed to #{sub.callback}, code #{code}" end) Logger.debug(fn -> "Pushed to #{sub.callback}, code #{code}" end)
else e -> else e ->
Logger.debug(fn -> "Couldn't push to #{sub.callback}, #{inspect(e)}" end) Logger.debug(fn -> "Couldn't push to #{sub.callback}, #{inspect(e)}" end)

2
test/web/salmon/salmon_test.exs
View File

@ -84,7 +84,7 @@ test "it pushes an activity to remote accounts it's addressed to" do
user = Repo.get_by(User, ap_id: activity.data["actor"]) user = Repo.get_by(User, ap_id: activity.data["actor"])
{:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user) {:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)
poster = fn (url, data, headers) -> poster = fn (url, data, headers, options) ->
assert url == "http://example.org/salmon" assert url == "http://example.org/salmon"
end end
Salmon.publish(user, activity, poster) Salmon.publish(user, activity, poster)