From 9a803d2e3f34fdc10a4860cd1cac4341ef16bbfd Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Mon, 8 Jun 2020 10:34:39 +0300 Subject: [PATCH] Revert "Don't execute queues when cron_enabled=false" This reverts commit cc673b88dfe2e2673bf3fc0f1cc82442a4291092. --- config/config.exs | 14 ++++---------- config/releases.exs | 18 ++++++++---------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/config/config.exs b/config/config.exs index cd3718e1f..8e9a9bae0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -97,22 +97,16 @@ else false end -queues = if String.to_existing_atom(System.get_env("CRON_ENABLED", "false")) do - [ +config :plausible, Oban, + repo: Plausible.Repo, + queues: [ provision_ssl_certificates: 1, fetch_tweets: 1, check_stats_emails: 1, email_reports: 1, site_setup_emails: 1, trial_notification_emails: 1 - ] -else - [] -end - -config :plausible, Oban, - repo: Plausible.Repo, - queues: queues, + ], crontab: crontab config :plausible, :google, diff --git a/config/releases.exs b/config/releases.exs index df7a73c1a..34a99b33d 100644 --- a/config/releases.exs +++ b/config/releases.exs @@ -144,18 +144,16 @@ crontab = [ {"*/10 * * * *", Plausible.Workers.ProvisionSslCertificates}, # Every 10 minutes ] -queues = [ - provision_ssl_certificates: 1, - fetch_tweets: 1, - check_stats_emails: 1, - email_reports: 1, - site_setup_emails: 1, - trial_notification_emails: 1 -] - config :plausible, Oban, repo: Plausible.Repo, - queues: if cron_enabled, do: queues, else: [] + queues: [ + provision_ssl_certificates: 1, + fetch_tweets: 1, + check_stats_emails: 1, + email_reports: 1, + site_setup_emails: 1, + trial_notification_emails: 1 + ], crontab: if cron_enabled, do: crontab, else: false config :logger, level: :warn