X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ffederator%2Ffederator.ex;h=ab3313de103711632d89507ebc2df6f033c82ec1;hb=22ddddce766b5ba867c561dbd8060c67393c5504;hp=5293507b56210a52f5958b89e9ad02143bfedad7;hpb=6843755834192c671aebece505a1ab9322e57eee;p=akkoma

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 5293507b5..ab3313de1 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -1,36 +1,77 @@
 defmodule Pleroma.Web.Federator do
+  use GenServer
   alias Pleroma.User
+  alias Pleroma.Web.WebFinger
   require Logger
 
   @websub Application.get_env(:pleroma, :websub)
+  @ostatus Application.get_env(:pleroma, :ostatus)
+  @max_jobs 10
+
+  def start_link do
+    GenServer.start_link(__MODULE__, {:sets.new(), :queue.new()}, name: __MODULE__)
+  end
 
   def handle(:publish, activity) do
-    Logger.debug("Running publish for #{activity.data["id"]}")
+    Logger.debug(fn -> "Running publish for #{activity.data["id"]}" end)
     with actor when not is_nil(actor) <- User.get_cached_by_ap_id(activity.data["actor"]) do
-      Logger.debug("Sending #{activity.data["id"]} out via websub")
+      Logger.debug(fn -> "Sending #{activity.data["id"]} out via websub" end)
       Pleroma.Web.Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity)
 
-      Logger.debug("Sending #{activity.data["id"]} out via salmon")
+      {:ok, actor} = WebFinger.ensure_keys_present(actor)
+      Logger.debug(fn -> "Sending #{activity.data["id"]} out via salmon" end)
       Pleroma.Web.Salmon.publish(actor, activity)
     end
   end
 
   def handle(:verify_websub, websub) do
-    Logger.debug("Running websub verification for #{websub.id} (#{websub.topic}, #{websub.callback})")
+    Logger.debug(fn -> "Running websub verification for #{websub.id} (#{websub.topic}, #{websub.callback})" end)
     @websub.verify(websub)
   end
 
+  def handle(:incoming_doc, doc) do
+    Logger.debug("Got document, trying to parse")
+    @ostatus.handle_incoming(doc)
+  end
+
   def handle(type, payload) do
-    Logger.debug("Unknown task: #{type}")
+    Logger.debug(fn -> "Unknown task: #{type}" end)
     {:error, "Don't know what do do with this"}
   end
 
   def enqueue(type, payload) do
-    # for now, just run immediately in a new process.
     if Mix.env == :test do
       handle(type, payload)
     else
-      spawn(fn -> handle(type, payload) end)
+      GenServer.cast(__MODULE__, {:enqueue, type, payload})
+    end
+  end
+
+  def maybe_start_job(running_jobs, queue) do
+    if (:sets.size(running_jobs) < @max_jobs) && !:queue.is_empty(queue) do
+      {{:value, {type, payload}}, queue} = :queue.out(queue)
+      {:ok, pid} = Task.start(fn -> handle(type, payload) end)
+      mref = Process.monitor(pid)
+      {:sets.add_element(mref, running_jobs), queue}
+    else
+      {running_jobs, queue}
     end
   end
+
+  def handle_cast({:enqueue, type, payload}, {running_jobs, queue}) do
+    queue = :queue.in({type, payload}, queue)
+    {running_jobs, queue} = maybe_start_job(running_jobs, queue)
+    {:noreply, {running_jobs, queue}}
+  end
+
+  def handle_info({:DOWN, ref, :process, _pid, _reason}, {running_jobs, queue}) do
+    running_jobs = :sets.del_element(ref, running_jobs)
+    {running_jobs, queue} = maybe_start_job(running_jobs, queue)
+    {:noreply, {running_jobs, queue}}
+  end
+
+  def handle_cast(m, state) do
+    IO.inspect("Unknown: #{inspect(m)}, #{inspect(state)}")
+    {:noreply, state}
+  end
 end