X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ffederator%2Ffederator.ex;h=57e11b4fb4e72964bb73e8dd56511b9addcc1955;hb=68aa9a2826410463ce8056c7e42ba60013376f19;hp=7c43152c31f00f13ecb3dd1c535de18ee807afa3;hpb=66aa35903e6b1108ceab7b6bea2cb7d895eb315e;p=akkoma

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 7c43152c3..57e11b4fb 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 ->
@@ -64,11 +66,12 @@ defmodule Pleroma.Web.Federator do
   end
 
   def handle(:incoming_doc, doc) do
-    Logger.debug("Got document, trying to parse")
+    Logger.info("Got document, trying to parse")
     @ostatus.handle_incoming(doc)
   end
 
   def handle(:incoming_ap_doc, params) do
+    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
@@ -106,10 +109,12 @@ defmodule Pleroma.Web.Federator do
   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
 
@@ -124,7 +129,7 @@ defmodule Pleroma.Web.Federator do
     end
   end
 
-  def handle_cast({:enqueue, type, payload, priority}, state) when type in [:incoming_doc] do
+  def handle_cast({:enqueue, type, payload, priority}, state) when type in [:incoming_doc, :incoming_ap_doc] do
     %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state
     i_queue = enqueue_sorted(i_queue, {type, payload}, 1)
     {i_running_jobs, i_queue} = maybe_start_job(i_running_jobs, i_queue)