squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Logging, put incoming ap docs into incoming queue.

Browse Source
This commit is contained in:
lain 2018-02-21 08:57:14 +01:00
parent 279e1ce556
commit 92021fd00c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/federator/federator.ex
View File

@ -64,11 +64,12 @@ defmodule Pleroma.Web.Federator do
end end
def handle(:incoming_doc, doc) do def handle(:incoming_doc, doc) do
Logger.debug("Got document, trying to parse") Logger.info("Got document, trying to parse")
@ostatus.handle_incoming(doc) @ostatus.handle_incoming(doc)
end end
def handle(:incoming_ap_doc, params) do def handle(:incoming_ap_doc, params) do
Logger.info("Handling incoming ap activity")
with {:ok, _user} <- ap_enabled_actor(params["actor"]), with {:ok, _user} <- ap_enabled_actor(params["actor"]),
nil <- Activity.get_by_ap_id(params["id"]), nil <- Activity.get_by_ap_id(params["id"]),
{:ok, activity} <- Transmogrifier.handle_incoming(params) do {:ok, activity} <- Transmogrifier.handle_incoming(params) do
@ -124,7 +125,7 @@ defmodule Pleroma.Web.Federator do
end end
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 %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state
i_queue = enqueue_sorted(i_queue, {type, payload}, 1) i_queue = enqueue_sorted(i_queue, {type, payload}, 1)
{i_running_jobs, i_queue} = maybe_start_job(i_running_jobs, i_queue) {i_running_jobs, i_queue} = maybe_start_job(i_running_jobs, i_queue)