Merge branch 'feld-Logger' into 'develop'

Logging cleanup

See merge request pleroma/pleroma!76

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/federator/federator.ex
Simple merge

diff --cc lib/pleroma/web/ostatus/ostatus.ex
Simple merge

diff --cc lib/pleroma/web/salmon/salmon.ex
index db1429c5ef0c1b3294a32e97e30865be43472258,caab5d484762fca115341c611c89d5445a4e91c9..ab0f97d5544e10dd059c799fc3871449e3c83a15
--- 1/lib/pleroma/web/salmon/salmon.ex
--- 2/lib/pleroma/web/salmon/salmon.ex
+++ b/lib/pleroma/web/salmon/salmon.ex
@@@ -147,10 -147,10 +147,10 @@@ defmodule Pleroma.Web.Salmon d
    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