Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
6ee0ca21
Commit
6ee0ca21
authored
Jun 23, 2017
by
lain
Browse files
Some salmon debug fixes.
Plus httpoison update.
parent
4ba67468
Changes
3
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/salmon/salmon.ex
View file @
6ee0ca21
...
...
@@ -132,7 +132,11 @@ def remote_users(%{data: %{"to" => to}}) do
end
defp
send_to_user
(%{
info:
%{
"salmon"
=>
salmon
}},
feed
,
poster
)
do
poster
.
(
salmon
,
feed
,
[{
"Content-Type"
,
"application/magic-envelope+xml"
}],
timeout:
10000
,
recv_timeout:
20000
)
with
{
:ok
,
%{
status_code:
code
}}
<-
poster
.
(
salmon
,
feed
,
[{
"Content-Type"
,
"application/magic-envelope+xml"
}],
timeout:
10000
,
recv_timeout:
20000
)
do
Logger
.
debug
(
fn
->
"Pushed to
#{
salmon
}
, code
#{
code
}
"
end
)
else
e
->
Logger
.
debug
(
fn
->
"Pushing salmon to
#{
salmon
}
failed,
#{
inspect
(
e
)
}
"
end
)
end
end
defp
send_to_user
(
_
,
_
,
_
),
do
:
nil
...
...
mix.exs
View file @
6ee0ca21
...
...
@@ -39,7 +39,7 @@ defp deps do
{
:html_sanitize_ex
,
"~> 1.3.0-rc1"
},
{
:calendar
,
"~> 0.16.1"
},
{
:cachex
,
"~> 2.1"
},
{
:httpoison
,
"~> 0.11.
1
"
},
{
:httpoison
,
"~> 0.11.
2
"
},
{
:ex_machina
,
"~> 2.0"
,
only:
:test
},
{
:credo
,
"~> 0.7"
,
only:
[
:dev
,
:test
]},
{
:mix_test_watch
,
"~> 0.2"
,
only:
:dev
}]
...
...
mix.lock
View file @
6ee0ca21
%{"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], []},
"cachex": {:hex, :cachex, "2.1.0", "fad49b4e78d11c6c314e75bd8c9408f5b78cb065c047442798caed10803ee3be", [:mix], [{:eternal, "~> 1.1", [hex: :eternal, optional: false]}]},
"calendar": {:hex, :calendar, "0.16.1", "782327ad8bae7c797b887840dc4ddb933f05ce6e333e5b04964d7a5d5f79bde3", [:mix], [{:tzdata, "~> 0.5.8 or ~> 0.1.201603", [hex: :tzdata, optional: false]}]},
"certifi": {:hex, :certifi, "1.
0.0
", "
1c787a85b1855ba354f0b8920392c19aa1d06b0ee1362f9141279620a5be2039
", [:rebar3], []},
"certifi": {:hex, :certifi, "1.
2.1
", "
c3904f192bd5284e5b13f20db3ceac9626e14eeacfbb492e19583cf0e37b22be
", [:rebar3], []},
"comeonin": {:hex, :comeonin, "3.0.2", "8b213268a6634bd2e31a8035a963e974681d13ccc1f73f2ae664b6ac4e993c96", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, optional: false]}]},
"con_cache": {:hex, :con_cache, "0.12.0", "2d961aec219aa5a914473873f348f5a6088292dc69d5192a9d25f8a1e13e9905", [:mix], [{:exactor, "~> 2.2.0", [hex: :exactor, optional: false]}]},
"connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], []},
...
...
@@ -18,10 +18,10 @@
"exactor": {:hex, :exactor, "2.2.3", "a6972f43bb6160afeb73e1d8ab45ba604cd0ac8b5244c557093f6e92ce582786", [:mix], []},
"fs": {:hex, :fs, "2.12.0", "ad631efacc9a5683c8eaa1b274e24fa64a1b8eb30747e9595b93bec7e492e25e", [:rebar3], []},
"gettext": {:hex, :gettext, "0.13.1", "5e0daf4e7636d771c4c71ad5f3f53ba09a9ae5c250e1ab9c42ba9edccc476263", [:mix], []},
"hackney": {:hex, :hackney, "1.
7.1
", "
e238c52c5df3c3b16ce613d3a51c7220a784d734879b1e231c9babd433ac1cb4
", [:rebar3], [{:certifi, "1.
0.0
", [hex: :certifi, optional: false]}, {:idna, "
4
.0.
0
", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]},
"hackney": {:hex, :hackney, "1.
8.6
", "
21a725db3569b3fb11a6af17d5c5f654052ce9624219f1317e8639183de4a423
", [:rebar3], [{:certifi, "1.
2.1
", [hex: :certifi, optional: false]}, {:idna, "
5
.0.
2
", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]},
"html_sanitize_ex": {:hex, :html_sanitize_ex, "1.3.0-rc2", "38560c868b7c5170f3d4ffd9b254551fe0355e7a0978ea65ae51f516fa7b58f4", [:mix], [{:mochiweb, "~> 2.15", [hex: :mochiweb, optional: false]}]},
"httpoison": {:hex, :httpoison, "0.11.
1
", "
d06c571274c0e77b6cc50e548db3fd7779f611fbed6681fd60a331f66c143a0b
", [:mix], [{:hackney, "~> 1.
7
.0", [hex: :hackney, optional: false]}]},
"idna": {:hex, :idna, "
4
.0.
0
", "
10aaa9f79d0b12cf0def53038547855b91144f1bfcc0ec73494f38bb7b9c4961", [:rebar3], [
]},
"httpoison": {:hex, :httpoison, "0.11.
2
", "
9e59f17a473ef6948f63c51db07320477bad8ba88cf1df60a3eee01150306665
", [:mix], [{:hackney, "~> 1.
8
.0", [hex: :hackney, optional: false]}]},
"idna": {:hex, :idna, "
5
.0.
2
", "
ac203208ada855d95dc591a764b6e87259cb0e2a364218f215ad662daa8cd6b4", [:rebar3], [{:unicode_util_compat, "0.2.0", [hex: :unicode_util_compat, optional: false]}
]},
"metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], []},
"mime": {:hex, :mime, "1.1.0", "01c1d6f4083d8aa5c7b8c246ade95139620ef8effb009edde934e0ec3b28090a", [:mix], []},
"mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], []},
...
...
@@ -37,4 +37,5 @@
"ranch": {:hex, :ranch, "1.3.2", "e4965a144dc9fbe70e5c077c65e73c57165416a901bd02ea899cfd95aa890986", [:rebar3], []},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], []},
"trailing_format_plug": {:hex, :trailing_format_plug, "0.0.6", "777fd71bbc30e54cb36133bacd38fac88d44be410bc60353fe48e91e14c0b990", [:mix], [{:cowboy, "~> 1.0.0", [hex: :cowboy, optional: false]}, {:plug, "> 0.12.0", [hex: :plug, optional: false]}]},
"tzdata": {:hex, :tzdata, "0.5.11", "3d5469a9f46bdf4a8760333dbdabdcc4751325035c454b10521f71e7c611ae50", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, optional: false]}]}}
"tzdata": {:hex, :tzdata, "0.5.11", "3d5469a9f46bdf4a8760333dbdabdcc4751325035c454b10521f71e7c611ae50", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, optional: false]}]},
"unicode_util_compat": {:hex, :unicode_util_compat, "0.2.0", "dbbccf6781821b1c0701845eaf966c9b6d83d7c3bfc65ca2b78b88b8678bfa35", [:rebar3], []}}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment