mirror of
https://github.com/zulip/zulip.git
synced 2025-10-23 04:52:12 +00:00
c5200e8b05
`deliver_scheduled_emails` tries to deliver the email synchronously, and if it fails, it retries after 10 seconds. Since it does not track retries, and always tries the earliest-scheduled-but-due message first, the worker will not make forward progress if there is a persistent failure with that message, and will retry indefinitely. This can result in excessive network or email delivery charges from the remote SMTP server. Switch to delivering emails via a new queue worker. The `deliver_scheduled_emails` job now serves only to pull deferred jobs out of the table once they are due, insert them into RabbitMQ, and then delete them. This limits the potential for head-of-queue failures to failures inserting into RabbitMQ, which is more reasonable than failures speaking to a complex external system we do not control. Retries and any connections to the SMTP server are left to the RabbitMQ consumer. We build a new RabbitMQ queue, rather than use the existing `email_senders` queue, because that queue is expected to be reasonably low-latency, for things like missed message notifications. The `send_future_email` codepath which inserts into ScheduledEmails is also (ab)used to digest emails, which are extremely bursty in their frequency -- and a large burst could significantly delay emails behind it in the queue. The new queue is explicitly only for messages which were not initiated by user actions (e.g., invitation reminders, digests, new account follow-ups) which are thus not latency-sensitive. Fixes: #32463.
57 lines
1.7 KiB
Python
57 lines
1.7 KiB
Python
"""\
|
|
Send email messages that have been queued for later delivery by
|
|
various things (e.g. invitation reminders and welcome emails).
|
|
|
|
This management command is run via supervisor.
|
|
"""
|
|
|
|
import logging
|
|
import time
|
|
from typing import Any
|
|
|
|
from django.conf import settings
|
|
from django.db import transaction
|
|
from django.utils.timezone import now as timezone_now
|
|
from typing_extensions import override
|
|
|
|
from zerver.lib.logging_util import log_to_file
|
|
from zerver.lib.management import ZulipBaseCommand
|
|
from zerver.lib.send_email import EmailNotDeliveredError, queue_scheduled_emails
|
|
from zerver.models import ScheduledEmail
|
|
|
|
## Setup ##
|
|
logger = logging.getLogger(__name__)
|
|
log_to_file(logger, settings.EMAIL_DELIVERER_LOG_PATH)
|
|
|
|
|
|
class Command(ZulipBaseCommand):
|
|
help = """Send emails queued by various parts of Zulip
|
|
for later delivery.
|
|
|
|
Run this command under supervisor.
|
|
|
|
Usage: ./manage.py deliver_scheduled_emails
|
|
"""
|
|
|
|
@override
|
|
def handle(self, *args: Any, **options: Any) -> None:
|
|
try:
|
|
while True:
|
|
with transaction.atomic(durable=True):
|
|
job = (
|
|
ScheduledEmail.objects.filter(scheduled_timestamp__lte=timezone_now())
|
|
.prefetch_related("users")
|
|
.select_for_update(skip_locked=True)
|
|
.order_by("scheduled_timestamp")
|
|
.first()
|
|
)
|
|
if job:
|
|
try:
|
|
queue_scheduled_emails(job)
|
|
except EmailNotDeliveredError:
|
|
logger.warning("%r not delivered", job)
|
|
else:
|
|
time.sleep(10)
|
|
except KeyboardInterrupt:
|
|
pass
|