projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ec34de0
)
fix http request in Salmon
author
Maksim Pechnikov
<parallel588@gmail.com>
Sun, 2 Dec 2018 14:00:33 +0000
(17:00 +0300)
committer
Maksim Pechnikov
<parallel588@gmail.com>
Tue, 4 Dec 2018 11:04:06 +0000
(14:04 +0300)
lib/pleroma/web/salmon/salmon.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/salmon/salmon.ex
b/lib/pleroma/web/salmon/salmon.ex
index b98ece6c9fa37ed520adc5f1a2a061a4f13aa81d..97251c05e6eb0ea42f5f25e1137ec25f24f6542b 100644
(file)
--- 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