From a16525d52028d5c02f37135679cbcce96b1f82e1 Mon Sep 17 00:00:00 2001 From: cuberoot74088 Date: Sun, 24 Dec 2023 13:06:43 +0100 Subject: [PATCH] fix backup filename and regexp pattern for cleanup (#2386) Co-authored-by: James Hodgkinson --- server/core/src/actors/v1_read.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/server/core/src/actors/v1_read.rs b/server/core/src/actors/v1_read.rs index 1080c37f4..aea0bd884 100644 --- a/server/core/src/actors/v1_read.rs +++ b/server/core/src/actors/v1_read.rs @@ -208,13 +208,8 @@ impl QueryServerReadV1 { ) -> Result<(), OperationError> { trace!(eventid = ?msg.eventid, "Begin online backup event"); - let now = match time::OffsetDateTime::now_local() { - Ok(val) => val, - Err(_err) => { - admin_warn!("Failed to get local offset, using UTC"); - time::OffsetDateTime::now_utc() - } - }; + let now = time::OffsetDateTime::now_utc(); + #[allow(clippy::unwrap_used)] let timestamp = now.format(&Rfc3339).unwrap(); let dest_file = format!("{}/backup-{}.json", outpath, timestamp); @@ -244,7 +239,7 @@ impl QueryServerReadV1 { } // pattern to find automatically generated backup files - let re = Regex::new(r"^backup-\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z\.json$").map_err( + let re = Regex::new(r"^backup-\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{1,9})?Z\.json$").map_err( |error| { error!( "Failed to parse regexp for online backup files: {:?}",