paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 14:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

scheduled_messages: Remove batching logic.

Browse Source 
The previous logic would attempt to send a large number of unrelated
messages in a single transaction, which is just asking for trouble in
the event that one of the attempts fails.
This commit is contained in:
Tim Abbott
2023-05-04 16:11:22 -07:00
parent d1dfab5b70
commit 1fc6ed224a
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/management/commands/deliver_scheduled_messages.py
View File

@@ -30,12 +30,18 @@ Usage: ./manage.py deliver_scheduled_messages
try: try:
while True: while True:
with transaction.atomic(): with transaction.atomic():
messages_to_deliver = ScheduledMessage.objects.filter( scheduled_message = (
ScheduledMessage.objects.filter(
scheduled_timestamp__lte=timezone_now(), delivered=False scheduled_timestamp__lte=timezone_now(), delivered=False
).select_for_update() )
for scheduled_message in messages_to_deliver: .select_for_update()
.first()
)
if scheduled_message is not None:
send_scheduled_message(scheduled_message) send_scheduled_message(scheduled_message)
continue
# If there's no overdue scheduled messages, go to sleep until the next minute.
cur_time = timezone_now() cur_time = timezone_now()
time_next_min = (cur_time + timedelta(minutes=1)).replace(second=0, microsecond=0) time_next_min = (cur_time + timedelta(minutes=1)).replace(second=0, microsecond=0)
sleep_time = (time_next_min - cur_time).total_seconds() sleep_time = (time_next_min - cur_time).total_seconds()