X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ffederator%2Ffederator.ex;h=51d2931960bd3b043f499967aad922371b1fe2c1;hb=9b97b023c53b88f4c04aed17e36022201016b6c9;hp=0b9808b8f919ed1e02ce45b578de2b5c88791382;hpb=92021fd00c538ac24f68dcd95ee18bef9de6cc0e;p=akkoma

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 0b9808b8f..51d293196 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -10,7 +10,9 @@ defmodule Pleroma.Web.Federator do
   @websub Application.get_env(:pleroma, :websub)
   @ostatus Application.get_env(:pleroma, :ostatus)
   @httpoison Application.get_env(:pleroma, :httpoison)
-  @max_jobs 10
+  @instance Application.get_env(:pleroma, :instance)
+  @federating Keyword.get(@instance, :federating)
+  @max_jobs 20
 
   def start_link do
     spawn(fn ->
@@ -46,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
 
@@ -59,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
 
@@ -69,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
@@ -94,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)
@@ -103,14 +105,16 @@ 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
-    if Mix.env == :test do
-      handle(type, payload)
-    else
-      GenServer.cast(__MODULE__, {:enqueue, type, payload, priority})
+    if @federating do
+      if Mix.env == :test do
+        handle(type, payload)
+      else
+        GenServer.cast(__MODULE__, {:enqueue, type, payload, priority})
+      end
     end
   end