moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mailer-queue' into 'develop' 

Fix digest email processing, consolidate Oban queues

See merge request pleroma/pleroma!3966
This commit is contained in:
feld 2023-11-07 20:45:48 +00:00
parent 4c5b45ed73 bf426c53b4
commit 11c520607f
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/digest_emails.fix Normal file
View File

@ -0,0 +1 @@
Fix the processing of email digest jobs.

1
config/config.exs
View File

@ -590,7 +590,6 @@
background: 5, background: 5,
remote_fetcher: 2, remote_fetcher: 2,
attachments_cleanup: 1, attachments_cleanup: 1,
new_users_digest: 1,
mute_expire: 5 mute_expire: 5
], ],
plugins: [Oban.Plugins.Pruner], plugins: [Oban.Plugins.Pruner],

2
lib/pleroma/workers/cron/digest_emails_worker.ex
View File

@ -7,7 +7,7 @@ defmodule Pleroma.Workers.Cron.DigestEmailsWorker do
The worker to send digest emails. The worker to send digest emails.
""" """
use Oban.Worker, queue: "digest_emails" use Oban.Worker, queue: "mailer"
alias Pleroma.Config alias Pleroma.Config
alias Pleroma.Emails alias Pleroma.Emails

2
lib/pleroma/workers/cron/new_users_digest_worker.ex
View File

@ -9,7 +9,7 @@ defmodule Pleroma.Workers.Cron.NewUsersDigestWorker do
import Ecto.Query import Ecto.Query
use Pleroma.Workers.WorkerHelper, queue: "new_users_digest" use Pleroma.Workers.WorkerHelper, queue: "mailer"
@impl Oban.Worker @impl Oban.Worker
def perform(_job) do def perform(_job) do

9
priv/repo/migrations/20231107200724_consolidate_email_queues.exs Normal file
View File

@ -0,0 +1,9 @@
defmodule Pleroma.Repo.Migrations.ConsolidateEmailQueues do
use Ecto.Migration
def change do
execute(
"UPDATE oban_jobs SET queue = 'mailer' WHERE queue in ('digest_emails', 'new_users_digest')"
)
end
end