summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-03-30 14:05:20 +0100
committerSean McGivern <sean@gitlab.com>2018-03-30 14:55:05 +0100
commit2db218f8bf186c509c927ce3e9d0502fee4f8349 (patch)
tree8290216f729e4d5d376986720b5f730eb16e4141 /config
parent5ab75649f3ea00b64cb63e7e5283100c6b70cfb5 (diff)
downloadgitlab-ce-2db218f8bf186c509c927ce3e9d0502fee4f8349.tar.gz
Send emails for issues due tomorrow
Also, refactor the mail sending slightly: instead of one worker sending all emails, create a worker per project with issues due, which will send all emails for that project.
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb6
-rw-r--r--config/sidekiq_queues.yml1
2 files changed, 4 insertions, 3 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 1ddf380c56d..c8a4c1af50f 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -453,9 +453,9 @@ Settings.cron_jobs['pages_domain_verification_cron_worker'] ||= Settingslogic.ne
Settings.cron_jobs['pages_domain_verification_cron_worker']['cron'] ||= '*/15 * * * *'
Settings.cron_jobs['pages_domain_verification_cron_worker']['job_class'] = 'PagesDomainVerificationCronWorker'
-Settings.cron_jobs['issue_due_worker'] ||= Settingslogic.new({})
-Settings.cron_jobs['issue_due_worker']['cron'] ||= '50 00 * * *'
-Settings.cron_jobs['issue_due_worker']['job_class'] = 'IssueDueWorker'
+Settings.cron_jobs['issue_due_scheduler_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['issue_due_scheduler_worker']['cron'] ||= '50 00 * * *'
+Settings.cron_jobs['issue_due_scheduler_worker']['job_class'] = 'IssueDueSchedulerWorker'
#
# GitLab Shell
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index c811034b29d..47fbbed44cf 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -34,6 +34,7 @@
- [email_receiver, 2]
- [emails_on_push, 2]
- [mailers, 2]
+ - [mail_scheduler, 2]
- [invalid_gpg_signature_update, 2]
- [create_gpg_signature, 2]
- [rebase, 2]