Merge branch 'feld-Logger' into 'develop'

[akkoma] / lib / pleroma / web / federator / federator.ex

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index daf836a401675c19bd7762a8c860023f4d12407c..51d2931960bd3b043f499967aad922371b1fe2c1 100644 (file)
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.Federator do
   @httpoison Application.get_env(:pleroma, :httpoison)
   @instance Application.get_env(:pleroma, :instance)
   @federating Keyword.get(@instance, :federating)
-  @max_jobs 10
+  @max_jobs 20
 
   def start_link do
     spawn(fn ->
@@ -48,10 +48,10 @@ defmodule Pleroma.Web.Federator do
     with actor when not is_nil(actor) <- User.get_cached_by_ap_id(activity.data["actor"]) do
       {:ok, actor} = WebFinger.ensure_keys_present(actor)
       if ActivityPub.is_public?(activity) do
-        Logger.info(fn -> "Sending #{activity.data["id"]} out via websub" end)
+        Logger.info(fn -> "Sending #{activity.data["id"]} out via WebSub" end)
         Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
 
-        Logger.info(fn -> "Sending #{activity.data["id"]} out via salmon" end)
+        Logger.info(fn -> "Sending #{activity.data["id"]} out via Salmon" end)
         Pleroma.Web.Salmon.publish(actor, activity)
       end
 
@@ -61,7 +61,7 @@ defmodule Pleroma.Web.Federator do
   end
 
   def handle(:verify_websub, websub) do
-    Logger.debug(fn -> "Running websub verification for #{websub.id} (#{websub.topic}, #{websub.callback})" end)
+    Logger.debug(fn -> "Running WebSub verification for #{websub.id} (#{websub.topic}, #{websub.callback})" end)
     @websub.verify(websub)
   end
 
@@ -71,7 +71,7 @@ defmodule Pleroma.Web.Federator do
   end
 
   def handle(:incoming_ap_doc, params) do
-    Logger.info("Handling incoming ap activity")
+    Logger.info("Handling incoming AP activity")
     with {:ok, _user} <- ap_enabled_actor(params["actor"]),
          nil <- Activity.get_by_ap_id(params["id"]),
          {:ok, activity} <- Transmogrifier.handle_incoming(params) do
@@ -96,7 +96,7 @@ defmodule Pleroma.Web.Federator do
     with {:ok, %{status_code: code}} <- @httpoison.post(callback, xml, [
                   {"Content-Type", "application/atom+xml"},
                   {"X-Hub-Signature", "sha1=#{signature}"}
-                ], timeout: 10000, recv_timeout: 20000) do
+                ], timeout: 10000, recv_timeout: 20000, hackney: [pool: :default]) do
       Logger.debug(fn -> "Pushed to #{callback}, code #{code}" end)
     else e ->
         Logger.debug(fn -> "Couldn't push to #{callback}, #{inspect(e)}" end)
@@ -105,7 +105,7 @@ defmodule Pleroma.Web.Federator do
 
   def handle(type, _) do
     Logger.debug(fn -> "Unknown task: #{type}" end)
-    {:error, "Don't know what do do with this"}
+    {:error, "Don't know what to do with this"}
   end
 
   def enqueue(type, payload, priority \\ 1) do