paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-29 19:13:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

queue: Remove missedmessage_email_senders.

Browse Source
This commit is contained in:
Mateusz Mandera
2020-01-31 13:25:04 +01:00
committed by Tim Abbott
parent a583da67b3
commit 4c5a8e6f0c
5 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/zulip/manifests/base.pp
View File

@@ -77,7 +77,6 @@ class zulip::base {
'embedded_bots', 'embedded_bots',
'error_reports', 'error_reports',
'invites', 'invites',
'missedmessage_email_senders',
'email_senders', 'email_senders',
'missedmessage_emails', 'missedmessage_emails',
'missedmessage_mobile_notifications', 'missedmessage_mobile_notifications',

9
puppet/zulip_ops/files/nagios3/conf.d/services.cfg
View File

@@ -483,15 +483,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

1
scripts/nagios/check-rabbitmq-consumers
View File

@@ -55,7 +55,6 @@ queues = {
'error_reports', 'error_reports',
'invites', 'invites',
'missedmessage_emails', 'missedmessage_emails',
'missedmessage_email_senders',
'email_senders', 'email_senders',
'missedmessage_mobile_notifications', 'missedmessage_mobile_notifications',
'outgoing_webhooks', 'outgoing_webhooks',

2
tools/test-queue-worker-reload
View File

@@ -14,7 +14,7 @@ sanity_check.check_venv(__file__)
# 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_launch = '[process_queue] 18 queue worker threads were launched\n' successful_worker_launch = '[process_queue] 17 queue worker threads were launched\n'
def check_worker_launch(run_dev: "subprocess.Popen[str]") -> bool: def check_worker_launch(run_dev: "subprocess.Popen[str]") -> bool:
failed = False failed = False

13
zerver/worker/queue_processors.py
View File

@@ -397,19 +397,6 @@ class EmailSendingWorker(QueueProcessingWorker):
handle_send_email_format_changes(copied_event) handle_send_email_format_changes(copied_event)
send_email_from_dict(copied_event) send_email_from_dict(copied_event)
@assign_queue('missedmessage_email_senders')
class MissedMessageSendingWorker(EmailSendingWorker): # nocoverage
"""
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): # nocoverage class PushNotificationsWorker(QueueProcessingWorker): # nocoverage
def start(self) -> None: def start(self) -> None: