From: lambda <pleromagit@rogerbraun.net>
Date: Tue, 20 Mar 2018 05:57:47 +0000 (+0000)
Subject: Merge branch 'feld-Logger' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9b97b023c53b88f4c04aed17e36022201016b6c9;p=akkoma

Merge branch 'feld-Logger' into 'develop'

Logging cleanup

See merge request pleroma/pleroma!76
---

9b97b023c53b88f4c04aed17e36022201016b6c9
diff --cc lib/pleroma/web/salmon/salmon.ex
index db1429c5e,caab5d484..ab0f97d55
--- a/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