mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 20:47:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix backup filename and regexp pattern for cleanup (#2386)

Browse source 
Co-authored-by: James Hodgkinson <james@terminaloutcomes.com>
This commit is contained in:
cuberoot74088 2023-12-24 13:06:43 +01:00 committed by GitHub
parent 53ef2552e1
commit a16525d520
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/core/src/actors/v1_read.rs
View file

@ -208,13 +208,8 @@ impl QueryServerReadV1 {
) -> Result<(), OperationError> { ) -> Result<(), OperationError> {
trace!(eventid = ?msg.eventid, "Begin online backup event"); trace!(eventid = ?msg.eventid, "Begin online backup event");
let now = match time::OffsetDateTime::now_local() { let now = time::OffsetDateTime::now_utc();
Ok(val) => val,
Err(_err) => {
admin_warn!("Failed to get local offset, using UTC");
time::OffsetDateTime::now_utc()
}
};
#[allow(clippy::unwrap_used)] #[allow(clippy::unwrap_used)]
let timestamp = now.format(&Rfc3339).unwrap(); let timestamp = now.format(&Rfc3339).unwrap();
let dest_file = format!("{}/backup-{}.json", outpath, timestamp); let dest_file = format!("{}/backup-{}.json", outpath, timestamp);
@ -244,7 +239,7 @@ impl QueryServerReadV1 {
} }
// pattern to find automatically generated backup files // 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| {
error!( error!(
"Failed to parse regexp for online backup files: {:?}", "Failed to parse regexp for online backup files: {:?}",