[pbs-devel] [PATCH proxmox-backup 2/3] client: progress log: factor out log message generation

[Christian Ebner <c.ebner@proxmox.com>]

Move the progress log output into a dedicated helper function, so it
can be reused for size based progress log output as well.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 pbs-client/src/backup_writer.rs | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pbs-client/src/backup_writer.rs b/pbs-client/src/backup_writer.rs
index 4d2e8a801..37ee39e2e 100644
--- a/pbs-client/src/backup_writer.rs
+++ b/pbs-client/src/backup_writer.rs
@@ -2,6 +2,7 @@ use std::collections::HashSet;
 use std::future::Future;
 use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
 use std::sync::{Arc, Mutex};
+use std::time::Instant;
 
 use anyhow::{bail, format_err, Error};
 use futures::future::{self, AbortHandle, Either, FutureExt, TryFutureExt};
@@ -690,12 +691,11 @@ impl BackupWriter {
             Some(tokio::spawn(async move {
                 loop {
                     tokio::time::sleep(tokio::time::Duration::from_secs(60)).await;
-
-                    let size = HumanByte::from(stream_len3.load(Ordering::SeqCst));
-                    let size_uploaded = HumanByte::from(uploaded_len.load(Ordering::SeqCst));
-                    let elapsed = TimeSpan::from(start_time.elapsed());
-
-                    log::info!("processed {size} in {elapsed}, uploaded {size_uploaded}");
+                    progress_log(
+                        stream_len3.load(Ordering::SeqCst),
+                        uploaded_len.load(Ordering::SeqCst),
+                        &start_time,
+                    );
                 }
             }))
         } else {
@@ -921,3 +921,12 @@ impl BackupWriter {
         Ok(speed)
     }
 }
+
+#[inline(always)]
+fn progress_log(size: usize, size_uploaded: usize, start_time: &Instant) {
+    let size = HumanByte::from(size);
+    let size_uploaded = HumanByte::from(size_uploaded);
+    let elapsed = TimeSpan::from(start_time.elapsed());
+
+    log::info!("processed {size} in {elapsed}, uploaded {size_uploaded}");
+}
-- 
2.39.5



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel