From 4c5a8e6f0cc32fc1a0f1048c6aaaf9189e8e5f42 Mon Sep 17 00:00:00 2001 From: Mateusz Mandera Date: Fri, 31 Jan 2020 13:25:04 +0100 Subject: [PATCH] queue: Remove missedmessage_email_senders. --- puppet/zulip/manifests/base.pp | 1 - puppet/zulip_ops/files/nagios3/conf.d/services.cfg | 9 --------- scripts/nagios/check-rabbitmq-consumers | 1 - tools/test-queue-worker-reload | 2 +- zerver/worker/queue_processors.py | 13 ------------- 5 files changed, 1 insertion(+), 25 deletions(-) diff --git a/puppet/zulip/manifests/base.pp b/puppet/zulip/manifests/base.pp index 4b0f8e5a83..5cf9c06bb9 100644 --- a/puppet/zulip/manifests/base.pp +++ b/puppet/zulip/manifests/base.pp @@ -77,7 +77,6 @@ class zulip::base { 'embedded_bots', 'error_reports', 'invites', - 'missedmessage_email_senders', 'email_senders', 'missedmessage_emails', 'missedmessage_mobile_notifications', diff --git a/puppet/zulip_ops/files/nagios3/conf.d/services.cfg b/puppet/zulip_ops/files/nagios3/conf.d/services.cfg index 71b49cdad9..8973ae90f4 100644 --- a/puppet/zulip_ops/files/nagios3/conf.d/services.cfg +++ b/puppet/zulip_ops/files/nagios3/conf.d/services.cfg @@ -483,15 +483,6 @@ define service { 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 { use generic-service service_description Check email_senders queue processor diff --git a/scripts/nagios/check-rabbitmq-consumers b/scripts/nagios/check-rabbitmq-consumers index a80f435607..8450b68be2 100755 --- a/scripts/nagios/check-rabbitmq-consumers +++ b/scripts/nagios/check-rabbitmq-consumers @@ -55,7 +55,6 @@ queues = { 'error_reports', 'invites', 'missedmessage_emails', - 'missedmessage_email_senders', 'email_senders', 'missedmessage_mobile_notifications', 'outgoing_webhooks', diff --git a/tools/test-queue-worker-reload b/tools/test-queue-worker-reload index d2ce95031f..6ec616efca 100755 --- a/tools/test-queue-worker-reload +++ b/tools/test-queue-worker-reload @@ -14,7 +14,7 @@ sanity_check.check_venv(__file__) # TODO: Convert this to use scripts/lib/queue_workers.py 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: failed = False diff --git a/zerver/worker/queue_processors.py b/zerver/worker/queue_processors.py index bd4e4f8cf3..9ee95bddb4 100644 --- a/zerver/worker/queue_processors.py +++ b/zerver/worker/queue_processors.py @@ -397,19 +397,6 @@ class EmailSendingWorker(QueueProcessingWorker): handle_send_email_format_changes(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') class PushNotificationsWorker(QueueProcessingWorker): # nocoverage def start(self) -> None: