X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=inline;f=lib%2Fpleroma%2Fweb%2Fsalmon%2Fsalmon.ex;h=ab0f97d5544e10dd059c799fc3871449e3c83a15;hb=83d4a1495ce530b6b308bb47668268d68a8fb3e2;hp=46ca645d1d37352c2d5545a44eca0751f23ee53d;hpb=460062f2b04220ffcd8f20aa842cc95582d1f849;p=akkoma

diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex
index 46ca645d1..ab0f97d55 100644
--- a/lib/pleroma/web/salmon/salmon.ex
+++ b/lib/pleroma/web/salmon/salmon.ex
@@ -147,10 +147,10 @@ defmodule Pleroma.Web.Salmon do
   end
 
   defp send_to_user(%{info: %{"salmon" => salmon}}, feed, poster) do
-    with {:ok, %{status_code: code}} <- poster.(salmon, feed, [{"Content-Type", "application/magic-envelope+xml"}], timeout: 10000, recv_timeout: 20000) do
+    with {:ok, %{status_code: code}} <- poster.(salmon, feed, [{"Content-Type", "application/magic-envelope+xml"}], timeout: 10000, recv_timeout: 20000, hackney: [pool: :default]) do
       Logger.debug(fn -> "Pushed to #{salmon}, code #{code}" end)
     else
-      e -> Logger.debug(fn -> "Pushing salmon to #{salmon} failed, #{inspect(e)}" end)
+      e -> Logger.debug(fn -> "Pushing Salmon to #{salmon} failed, #{inspect(e)}" end)
     end
   end
 
@@ -178,7 +178,7 @@ defmodule Pleroma.Web.Salmon do
       remote_users(activity)
       |> Enum.each(fn(remote_user) ->
         Task.start(fn ->
-          Logger.debug(fn -> "sending salmon to #{remote_user.ap_id}" end)
+          Logger.debug(fn -> "Sending Salmon to #{remote_user.ap_id}" end)
           send_to_user(remote_user, feed, poster)
         end)
       end)