jude/reminder-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Add fail cutoff for reminder updating

Browse Source
This commit is contained in:
jude 2023-06-20 15:41:28 +01:00
parent fa542bb24f
commit 799298ca34
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
postman/src/sender.rs
View File

@ -361,8 +361,9 @@ WHERE
let now = Utc::now(); let now = Utc::now();
let mut updated_reminder_time = let mut updated_reminder_time =
self.utc_time.with_timezone(&self.timezone.parse().unwrap_or(Tz::UTC)); self.utc_time.with_timezone(&self.timezone.parse().unwrap_or(Tz::UTC));
let mut fail_count = 0;
while updated_reminder_time < now { while updated_reminder_time < now && fail_count < 4 {
if let Some(interval) = self.interval_months { if let Some(interval) = self.interval_months {
if interval != 0 { if interval != 0 {
updated_reminder_time = updated_reminder_time updated_reminder_time = updated_reminder_time
@ -372,6 +373,7 @@ WHERE
"{}: Could not add {} months to a reminder", "{}: Could not add {} months to a reminder",
interval, self.id interval, self.id
); );
fail_count += 1;
updated_reminder_time updated_reminder_time
}); });
@ -380,13 +382,14 @@ WHERE
if let Some(interval) = self.interval_days { if let Some(interval) = self.interval_days {
if interval != 0 { if interval != 0 {
if let Some(new_time) = updated_reminder_time = updated_reminder_time
updated_reminder_time.checked_add_days(Days::new(interval as u64)) .checked_add_days(Days::new(interval as u64))
{ .unwrap_or_else(|| {
updated_reminder_time = new_time
} else {
warn!("{}: Could not add {} days to a reminder", self.id, interval); warn!("{}: Could not add {} days to a reminder", self.id, interval);
} fail_count += 1;
updated_reminder_time
})
} }
} }
@ -395,7 +398,11 @@ WHERE
} }
} }
if self.expires.map_or(false, |expires| updated_reminder_time > expires) { if fail_count >= 4 {
error!("Reminder {} failed to update 4 times and so is being deleted", self.id);
self.force_delete(pool).await;
} else if self.expires.map_or(false, |expires| updated_reminder_time > expires) {
self.force_delete(pool).await; self.force_delete(pool).await;
} else { } else {
sqlx::query!( sqlx::query!(