federator: publisher: integrate job queue, simplify publish_one logic

This commit is contained in:
William Pitcock 2019-05-12 03:43:53 +00:00
parent ef1f9e8d4e
commit 0afc8d7856
1 changed files with 22 additions and 7 deletions

View File

@ -3,6 +3,10 @@
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Federator.Publisher do defmodule Pleroma.Web.Federator.Publisher do
alias Pleroma.Web.Federator.RetryQueue
require Logger
@moduledoc """ @moduledoc """
Defines the contract used by federation implementations to publish messages to Defines the contract used by federation implementations to publish messages to
their peers. their peers.
@ -24,15 +28,26 @@ defmodule Pleroma.Web.Federator.Publisher do
""" """
@callback publish(Pleroma.User.t(), Pleroma.Activity.t()) :: :ok | {:error, any()} @callback publish(Pleroma.User.t(), Pleroma.Activity.t()) :: :ok | {:error, any()}
@doc """
Enqueues work generated by the federation module.
"""
@spec enqueue(module(), keyword()) :: :ok
def enqueue(module, args), do: PleromaJobQueue.enqueue(:federation_outgoing, module, args)
@doc """ @doc """
Enqueue publishing a single activity. Enqueue publishing a single activity.
""" """
@spec enqueue_one(module(), Map.t()) :: :ok @spec enqueue_one(module(), Map.t()) :: :ok
def enqueue_one(module, %{} = args), do: enqueue(module, [:publish_one, args]) def enqueue_one(module, %{} = params),
do: PleromaJobQueue.enqueue(:federation_outgoing, __MODULE__, [:publish_one, module, params])
@spec perform(atom(), module(), any()) :: {:ok, any()} | {:error, any()}
def perform(:publish_one, module, params) do
case apply(module, :publish_one, [params]) do
{:ok, _} ->
:ok
{:error, _} ->
RetryQueue.enqueue(params, module)
end
end
def perform(type, _, _) do
Logger.debug("Unknown task: #{type}")
{:error, "Don't know what to do with this"}
end
end end