filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed cron issue handling DST

Browse Source
This commit is contained in:
Mauro D
2023-10-29 20:42:36 +01:00
parent 795ad97553
commit ee088d5184
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/utils/src/config/cron.rs
View File

@@ -41,7 +41,8 @@ impl SimpleCron {
SimpleCron::Day { hour, minute } => {
let next = chrono::Local
.with_ymd_and_hms(now.year(), now.month(), now.day(), *hour, *minute, 0)
.unwrap();
.earliest()
.unwrap_or_else(|| now - chrono::Duration::seconds(1));
if next < now {
next + chrono::Duration::days(1)
} else {
@@ -51,7 +52,8 @@ impl SimpleCron {
SimpleCron::Week { day, hour, minute } => {
let next = chrono::Local
.with_ymd_and_hms(now.year(), now.month(), now.day(), *hour, *minute, 0)
.unwrap();
.earliest()
.unwrap_or_else(|| now - chrono::Duration::seconds(1));
if next < now {
next + chrono::Duration::days(
(7 - now.weekday().number_from_monday() + *day).into(),
@@ -63,7 +65,8 @@ impl SimpleCron {
SimpleCron::Hour { minute } => {
let next = chrono::Local
.with_ymd_and_hms(now.year(), now.month(), now.day(), now.hour(), *minute, 0)
.unwrap();
.earliest()
.unwrap_or_else(|| now - chrono::Duration::seconds(1));
if next < now {
next + chrono::Duration::hours(1)
} else {