mirror of
https://github.com/zulip/zulip.git
synced 2025-11-14 10:57:58 +00:00
queue: Remove missedmessage_email_senders code.
After 68513952fb, all emails are sent through email_senders queue.
This commit removes code related to the legacy queue.
This commit is contained in:
@@ -46,7 +46,6 @@ class zulip::base {
|
|||||||
'error_reports',
|
'error_reports',
|
||||||
'feedback_messages',
|
'feedback_messages',
|
||||||
'invites',
|
'invites',
|
||||||
'missedmessage_email_senders',
|
|
||||||
'email_senders',
|
'email_senders',
|
||||||
'missedmessage_emails',
|
'missedmessage_emails',
|
||||||
'missedmessage_mobile_notifications',
|
'missedmessage_mobile_notifications',
|
||||||
|
|||||||
@@ -555,15 +555,6 @@ define service {
|
|||||||
contact_groups admins
|
contact_groups admins
|
||||||
}
|
}
|
||||||
|
|
||||||
define service {
|
|
||||||
use generic-service
|
|
||||||
service_description Check missedmessage_email_senders queue processor
|
|
||||||
check_command check_remote_arg_string!manage.py process_queue --queue_name=missedmessage_email_senders!1:1!1:1
|
|
||||||
max_check_attempts 3
|
|
||||||
hostgroup_name frontends
|
|
||||||
contact_groups admins
|
|
||||||
}
|
|
||||||
|
|
||||||
define service {
|
define service {
|
||||||
use generic-service
|
use generic-service
|
||||||
service_description Check email_senders queue processor
|
service_description Check email_senders queue processor
|
||||||
|
|||||||
@@ -50,7 +50,6 @@ queues = {
|
|||||||
'invites',
|
'invites',
|
||||||
'message_sender',
|
'message_sender',
|
||||||
'missedmessage_emails',
|
'missedmessage_emails',
|
||||||
'missedmessage_email_senders',
|
|
||||||
'email_senders',
|
'email_senders',
|
||||||
'missedmessage_mobile_notifications',
|
'missedmessage_mobile_notifications',
|
||||||
'outgoing_webhooks',
|
'outgoing_webhooks',
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ from typing import IO, Text
|
|||||||
# TODO: Convert this to use scripts/lib/queue_workers.py
|
# TODO: Convert this to use scripts/lib/queue_workers.py
|
||||||
TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
|
TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
successful_worker_launches = [
|
successful_worker_launches = [
|
||||||
'[process_queue] 20 queue worker threads were launched',
|
'[process_queue] 19 queue worker threads were launched',
|
||||||
]
|
]
|
||||||
|
|
||||||
def check_worker_launch(logfile_name):
|
def check_worker_launch(logfile_name):
|
||||||
|
|||||||
@@ -308,19 +308,6 @@ class EmailSendingWorker(QueueProcessingWorker):
|
|||||||
del copied_event['failed_tries']
|
del copied_event['failed_tries']
|
||||||
send_email_from_dict(copied_event)
|
send_email_from_dict(copied_event)
|
||||||
|
|
||||||
@assign_queue('missedmessage_email_senders')
|
|
||||||
class MissedMessageSendingWorker(EmailSendingWorker):
|
|
||||||
"""
|
|
||||||
Note: Class decorators are not inherited.
|
|
||||||
|
|
||||||
The `missedmessage_email_senders` queue was used up through 1.7.1, so we
|
|
||||||
keep consuming from it in case we've just upgraded from an old version.
|
|
||||||
After the 1.8 release, we can delete it and tell admins to upgrade to 1.8
|
|
||||||
first.
|
|
||||||
"""
|
|
||||||
# TODO: zulip-1.8: Delete code related to missedmessage_email_senders queue.
|
|
||||||
pass
|
|
||||||
|
|
||||||
@assign_queue('missedmessage_mobile_notifications')
|
@assign_queue('missedmessage_mobile_notifications')
|
||||||
class PushNotificationsWorker(QueueProcessingWorker):
|
class PushNotificationsWorker(QueueProcessingWorker):
|
||||||
def consume(self, data):
|
def consume(self, data):
|
||||||
|
|||||||
Reference in New Issue
Block a user