Use separate queues for mailer scheduler and updater

pentacent · Dec 15, 2024 · 9dbc2d5 · 9dbc2d5
1 parent ad993d3
commit 9dbc2d5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/config/config.exs b/config/config.exs
@@ -84,15 +84,17 @@ config :phoenix, :json_library, Jason
 config :keila, Oban,
   queues: [
     mailer: 50,
-    periodic: 1
+    mailer_scheduler: 1,
+    updater: 1
   ],
   repo: Keila.Repo,
   plugins: [
     {Oban.Plugins.Pruner, max_age: 1800},
     {Oban.Plugins.Cron,
      crontab: [
        {"* * * * *", Keila.Mailings.DeliverScheduledCampaignsWorker},
-       {"* * * * *", Keila.Mailings.ScheduleWorker}
+       {"* * * * *", Keila.Mailings.ScheduleWorker},
+       {"0 0 * * *", Keila.Instance.UpdateCronWorker}
      ]}
   ]
 

diff --git a/lib/keila/instance/update_cron_worker.ex b/lib/keila/instance/update_cron_worker.ex
@@ -1,6 +1,6 @@
 defmodule Keila.Instance.UpdateCronWorker do
   use Oban.Worker,
-    queue: :periodic,
+    queue: :updater,
     unique: [
       period: :infinity,
       states: [:available, :scheduled, :executing]

diff --git a/lib/keila/mailings/deliver_scheduled_campaigns_worker.ex b/lib/keila/mailings/deliver_scheduled_campaigns_worker.ex
@@ -1,5 +1,5 @@
 defmodule Keila.Mailings.DeliverScheduledCampaignsWorker do
-  use Oban.Worker, queue: :periodic
+  use Oban.Worker, queue: :mailer_scheduler
   alias Keila.Mailings
 
   def perform(%Oban.Job{}) do

diff --git a/lib/keila/mailings/schedule_worker.ex b/lib/keila/mailings/schedule_worker.ex
@@ -7,7 +7,7 @@ defmodule Keila.Mailings.ScheduleWorker do
   """
 
   use Oban.Worker,
-    queue: :periodic,
+    queue: :mailer_scheduler,
     unique: [
       period: :infinity,
       states: [:available, :scheduled, :executing]

diff --git a/test/keila/mailings/mailings_campaign_test.exs b/test/keila/mailings/mailings_campaign_test.exs
@@ -83,7 +83,7 @@ defmodule Keila.MailingsCampaignTest do
 
     assert :ok = Mailings.deliver_campaign(campaign.id)
 
-    assert %{success: 1} = Oban.drain_queue(queue: :periodic)
+    assert %{success: 1} = Oban.drain_queue(queue: :mailer_scheduler)
     assert %{success: ^n, failure: 0} = Oban.drain_queue(queue: :mailer, with_scheduled: true)
 
     for _ <- 1..n do
@@ -122,7 +122,7 @@ defmodule Keila.MailingsCampaignTest do
 
     assert :ok = Mailings.deliver_campaign(campaign.id)
 
-    assert %{success: 1} = Oban.drain_queue(queue: :periodic)
+    assert %{success: 1} = Oban.drain_queue(queue: :mailer_scheduler)
 
     assert %{success: ^n_expected_sent, failure: 0, snoozed: ^n_expected_snoozed} =
              Oban.drain_queue(queue: :mailer, with_scheduled: true)
@@ -161,7 +161,7 @@ defmodule Keila.MailingsCampaignTest do
 
     assert :ok = Mailings.deliver_campaign(campaign.id)
 
-    assert %{success: 1} = Oban.drain_queue(queue: :periodic)
+    assert %{success: 1} = Oban.drain_queue(queue: :mailer_scheduler)
     assert %{success: ^n, failure: 0} = Oban.drain_queue(queue: :mailer, with_scheduled: true)
 
     for _ <- 1..n do
@@ -186,7 +186,7 @@ defmodule Keila.MailingsCampaignTest do
 
     assert :ok = Mailings.deliver_campaign(campaign.id)
 
-    assert %{success: 1} = Oban.drain_queue(queue: :periodic)
+    assert %{success: 1} = Oban.drain_queue(queue: :mailer_scheduler)
     assert %{success: ^n, failure: 0} = Oban.drain_queue(queue: :mailer, with_scheduled: true)
 
     for _ <- 1..n do
@@ -308,7 +308,7 @@ defmodule Keila.MailingsCampaignTest do
       )
 
     assert :ok = Mailings.deliver_campaign(campaign.id)
-    assert %{success: 1} = Oban.drain_queue(queue: :periodic)
+    assert %{success: 1} = Oban.drain_queue(queue: :mailer_scheduler)
     assert %{success: 1, failure: 0} = Oban.drain_queue(queue: :mailer, with_scheduled: true)
 
     receive do
@@ -343,7 +343,7 @@ defmodule Keila.MailingsCampaignTest do
 
     assert :ok = Mailings.deliver_campaign(campaign.id)
 
-    assert %{success: 1} = Oban.drain_queue(queue: :periodic)
+    assert %{success: 1} = Oban.drain_queue(queue: :mailer_scheduler)
     assert %{success: 1, cancelled: 1} = Oban.drain_queue(queue: :mailer, with_scheduled: true)
     assert %{status: :sent} = Mailings.get_campaign_stats(campaign.id)
   end

diff --git a/test/keila/mailings/rate_limiter_test.ex → test/keila/mailings/rate_limiter_test.exs b/test/keila/mailings/rate_limiter_test.ex → test/keila/mailings/rate_limiter_test.exs