From 4a022e1a3fe0846738e03e59114a3a7fc4a6665e Mon Sep 17 00:00:00 2001 From: Christian Ebner Date: Tue, 15 Apr 2025 11:11:15 +0200 Subject: [PATCH] api: backup: include previous snapshot name in log message Extends the log messages written to the server's backup worker task log to include the snapshot name which is used as previous snapshot. This information facilitates debugging efforts, as the previous snapshot might have been pruned since. For example, instead of ``` download 'index.json.blob' from previous backup. register chunks in 'drive-scsi0.img.fidx' from previous backup. download 'drive-scsi0.img.fidx' from previous backup. ``` this now logs ``` download 'index.json.blob' from previous backup 'vm/101/2025-04-15T09:02:10Z'. register chunks in 'drive-scsi0.img.fidx' from previous backup 'vm/101/2025-04-15T09:02:10Z'. download 'drive-scsi0.img.fidx' from previous backup 'vm/101/2025-04-15T09:02:10Z'. ``` Signed-off-by: Christian Ebner --- src/api2/backup/mod.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/api2/backup/mod.rs b/src/api2/backup/mod.rs index 344c80d4..629df933 100644 --- a/src/api2/backup/mod.rs +++ b/src/api2/backup/mod.rs @@ -853,8 +853,8 @@ fn download_previous( }; if let Some(index) = index { env.log(format!( - "register chunks in '{}' from previous backup.", - archive_name + "register chunks in '{archive_name}' from previous backup '{}'.", + last_backup.backup_dir.dir(), )); for pos in 0..index.index_count() { @@ -865,7 +865,10 @@ fn download_previous( } } - env.log(format!("download '{}' from previous backup.", archive_name)); + env.log(format!( + "download '{archive_name}' from previous backup '{}'.", + last_backup.backup_dir.dir(), + )); crate::api2::helpers::create_download_response(path).await } .boxed()