aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-02-21 08:57:14 +0100
committerlain <lain@soykaf.club>2018-02-21 08:57:14 +0100
commit92021fd00c538ac24f68dcd95ee18bef9de6cc0e (patch)
tree5c79e541ca7b0f8ad0950e788c2b3ad52a085d07 /lib
parent279e1ce556f063fa9725375622896f8f091be3c4 (diff)
downloadpleroma-92021fd00c538ac24f68dcd95ee18bef9de6cc0e.tar.gz
Logging, put incoming ap docs into incoming queue.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/federator/federator.ex5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 7c43152c3..0b9808b8f 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -64,11 +64,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
@@ -124,7 +125,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)