mirror of
https://github.com/zulip/zulip.git
synced 2025-11-15 19:31:58 +00:00
e603237010
A key part of this is the new helper, get_user_by_delivery_email. Its verbose name is important for clarity; it should help avoid blind copy-pasting of get_user (which we'll also want to rename). Unfortunately, it requires detailed understanding of the context to figure out which one to use; each is used in about half of call sites. Another important note is that this PR doesn't migrate get_user calls in the tests except where not doing so would cause the tests to fail. This probably deserves a follow-up refactor to avoid bugs here.
77 lines
3.3 KiB
Python
77 lines
3.3 KiB
Python
import logging
|
|
import time
|
|
from typing import Any, Dict
|
|
from datetime import timedelta
|
|
|
|
from django.conf import settings
|
|
from django.core.management.base import BaseCommand
|
|
from django.db import transaction
|
|
from django.utils.timezone import now as timezone_now
|
|
|
|
from zerver.lib.context_managers import lockfile
|
|
from zerver.lib.logging_util import log_to_file
|
|
from zerver.lib.management import sleep_forever
|
|
from zerver.models import ScheduledMessage, Message, get_user_by_delivery_email
|
|
from zerver.lib.actions import do_send_messages
|
|
from zerver.lib.addressee import Addressee
|
|
|
|
## Setup ##
|
|
logger = logging.getLogger(__name__)
|
|
log_to_file(logger, settings.SCHEDULED_MESSAGE_DELIVERER_LOG_PATH)
|
|
|
|
class Command(BaseCommand):
|
|
help = """Deliver scheduled messages from the ScheduledMessage table.
|
|
Run this command under supervisor.
|
|
|
|
This management command is run via supervisor. Do not run on multiple
|
|
machines, as you may encounter multiple sends in a specific race
|
|
condition. (Alternatively, you can set `EMAIL_DELIVERER_DISABLED=True`
|
|
on all but one machine to make the command have no effect.)
|
|
|
|
Usage: ./manage.py deliver_scheduled_messages
|
|
"""
|
|
|
|
def construct_message(self, scheduled_message: ScheduledMessage) -> Dict[str, Any]:
|
|
message = Message()
|
|
original_sender = scheduled_message.sender
|
|
message.content = scheduled_message.content
|
|
message.recipient = scheduled_message.recipient
|
|
message.subject = scheduled_message.subject
|
|
message.pub_date = timezone_now()
|
|
message.sending_client = scheduled_message.sending_client
|
|
|
|
delivery_type = scheduled_message.delivery_type
|
|
if delivery_type == ScheduledMessage.SEND_LATER:
|
|
message.sender = original_sender
|
|
elif delivery_type == ScheduledMessage.REMIND:
|
|
message.sender = get_user_by_delivery_email(settings.REMINDER_BOT, original_sender.realm)
|
|
|
|
return {'message': message, 'stream': scheduled_message.stream,
|
|
'realm': scheduled_message.realm}
|
|
|
|
def handle(self, *args: Any, **options: Any) -> None:
|
|
|
|
if settings.EMAIL_DELIVERER_DISABLED:
|
|
# Here doing a check and sleeping indefinitely on this setting might
|
|
# not sound right. Actually we do this check to avoid running this
|
|
# process on every server that might be in service to a realm. See
|
|
# the comment in zproject/settings.py file about renaming this setting.
|
|
sleep_forever()
|
|
|
|
with lockfile("/tmp/zulip_scheduled_message_deliverer.lockfile"):
|
|
while True:
|
|
messages_to_deliver = ScheduledMessage.objects.filter(
|
|
scheduled_timestamp__lte=timezone_now(),
|
|
delivered=False)
|
|
if messages_to_deliver:
|
|
for message in messages_to_deliver:
|
|
with transaction.atomic():
|
|
do_send_messages([self.construct_message(message)])
|
|
message.delivered = True
|
|
message.save(update_fields=['delivered'])
|
|
|
|
cur_time = timezone_now()
|
|
time_next_min = (cur_time + timedelta(minutes=1)).replace(second=0, microsecond=0)
|
|
sleep_time = (time_next_min - cur_time).total_seconds()
|
|
time.sleep(sleep_time)
|