diff options
| author | feld <feld@feld.me> | 2023-11-07 20:45:48 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2023-11-07 20:45:48 +0000 |
| commit | 11c520607fcb2bf5b8323d1b22b3123acf12efe1 (patch) | |
| tree | a50fbee61d24e124d84197d8f4936986e58b7854 /lib | |
| parent | 4c5b45ed73e93e6e8bcfeb527b9b398ec64c0caf (diff) | |
| parent | bf426c53b4e1c025d7857adf485976421175cdf6 (diff) | |
| download | pleroma-11c520607fcb2bf5b8323d1b22b3123acf12efe1.tar.gz pleroma-11c520607fcb2bf5b8323d1b22b3123acf12efe1.zip | |
Merge branch 'mailer-queue' into 'develop'
Fix digest email processing, consolidate Oban queues
See merge request pleroma/pleroma!3966
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/workers/cron/digest_emails_worker.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/workers/cron/new_users_digest_worker.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/workers/cron/digest_emails_worker.ex b/lib/pleroma/workers/cron/digest_emails_worker.ex index 1540c1605..0292bbb3b 100644 --- a/lib/pleroma/workers/cron/digest_emails_worker.ex +++ b/lib/pleroma/workers/cron/digest_emails_worker.ex @@ -7,7 +7,7 @@ defmodule Pleroma.Workers.Cron.DigestEmailsWorker do The worker to send digest emails. """ - use Oban.Worker, queue: "digest_emails" + use Oban.Worker, queue: "mailer" alias Pleroma.Config alias Pleroma.Emails diff --git a/lib/pleroma/workers/cron/new_users_digest_worker.ex b/lib/pleroma/workers/cron/new_users_digest_worker.ex index 267fe2837..1c3e445aa 100644 --- a/lib/pleroma/workers/cron/new_users_digest_worker.ex +++ b/lib/pleroma/workers/cron/new_users_digest_worker.ex @@ -9,7 +9,7 @@ defmodule Pleroma.Workers.Cron.NewUsersDigestWorker do import Ecto.Query - use Pleroma.Workers.WorkerHelper, queue: "new_users_digest" + use Pleroma.Workers.WorkerHelper, queue: "mailer" @impl Oban.Worker def perform(_job) do |