[pbs-devel] [PATCH proxmox-backup 09/10] replace print with log macro

Hannes Laimer h.laimer at proxmox.com
Fri Mar 11 16:07:54 CET 2022


Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
---
 examples/upload-speed.rs                      |  2 +-
 .../src/proxmox_restore_daemon/api.rs         |  1 -
 pxar-bin/Cargo.toml                           |  1 +
 pxar-bin/src/main.rs                          | 48 ++++---------------
 src/api2/admin/datastore.rs                   |  2 +-
 src/bin/sg-tape-cmd.rs                        | 10 ++--
 6 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/examples/upload-speed.rs b/examples/upload-speed.rs
index 04e35124..d29c25ba 100644
--- a/examples/upload-speed.rs
+++ b/examples/upload-speed.rs
@@ -21,7 +21,7 @@ async fn upload_speed() -> Result<f64, Error> {
     let client = BackupWriter::start(client, None, datastore, "host", "speedtest", backup_time, false, true).await?;
 
     println!("start upload speed test");
-    let res = client.upload_speedtest(true).await?;
+    let res = client.upload_speedtest().await?;
 
     Ok(res)
 }
diff --git a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
index 1333590d..0875e291 100644
--- a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
+++ b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
@@ -333,7 +333,6 @@ fn extract(
                         entries_max: ENCODER_MAX_ENTRIES,
                         device_set: None,
                         patterns,
-                        verbose: false,
                         skip_lost_and_found: false,
                     };
 
diff --git a/pxar-bin/Cargo.toml b/pxar-bin/Cargo.toml
index 14c447a0..b7f93666 100644
--- a/pxar-bin/Cargo.toml
+++ b/pxar-bin/Cargo.toml
@@ -11,6 +11,7 @@ path = "src/main.rs"
 [dependencies]
 anyhow = "1.0"
 futures = "0.3"
+log = "0.4"
 nix = "0.19.1"
 serde_json = "1.0"
 tokio = { version = "1.6", features = [ "rt", "rt-multi-thread" ] }
diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs
index 495cc119..4268eba0 100644
--- a/pxar-bin/src/main.rs
+++ b/pxar-bin/src/main.rs
@@ -21,7 +21,6 @@ fn extract_archive_from_reader<R: std::io::Read>(
     reader: &mut R,
     target: &str,
     feature_flags: Flags,
-    verbose: bool,
     options: PxarExtractOptions,
 ) -> Result<(), Error> {
     pbs_client::pxar::extract_archive(
@@ -29,9 +28,7 @@ fn extract_archive_from_reader<R: std::io::Read>(
         Path::new(target),
         feature_flags,
         |path| {
-            if verbose {
-                println!("{:?}", path);
-            }
+            log::debug!("{:?}", path);
         },
         options,
     )
@@ -56,11 +53,6 @@ fn extract_archive_from_reader<R: std::io::Read>(
                 description: "Target directory",
                 optional: true,
             },
-            verbose: {
-                description: "Verbose output.",
-                optional: true,
-                default: false,
-            },
             "no-xattrs": {
                 description: "Ignore extended file attributes.",
                 optional: true,
@@ -114,7 +106,6 @@ fn extract_archive(
     archive: String,
     pattern: Option<Vec<String>>,
     target: Option<String>,
-    verbose: bool,
     no_xattrs: bool,
     no_fcaps: bool,
     no_acls: bool,
@@ -178,7 +169,7 @@ fn extract_archive(
         // otherwise we want to log them but not act on them
         Some(Box::new(move |err| {
             was_ok.store(false, Ordering::Release);
-            eprintln!("error: {}", err);
+            log::error!("error: {}", err);
             Ok(())
         }) as Box<dyn FnMut(Error) -> Result<(), Error> + Send>)
     };
@@ -197,20 +188,16 @@ fn extract_archive(
             &mut reader,
             target,
             feature_flags,
-            verbose,
             options,
         )?;
     } else {
-        if verbose {
-            println!("PXAR extract: {}", archive);
-        }
+        log::debug!("PXAR extract: {}", archive);
         let file = std::fs::File::open(archive)?;
         let mut reader = std::io::BufReader::new(file);
         extract_archive_from_reader(
             &mut reader,
             target,
             feature_flags,
-            verbose,
             options,
         )?;
     }
@@ -231,11 +218,6 @@ fn extract_archive(
             source: {
                 description: "Source directory.",
             },
-            verbose: {
-                description: "Verbose output.",
-                optional: true,
-                default: false,
-            },
             "no-xattrs": {
                 description: "Ignore extended file attributes.",
                 optional: true,
@@ -295,7 +277,6 @@ fn extract_archive(
 async fn create_archive(
     archive: String,
     source: String,
-    verbose: bool,
     no_xattrs: bool,
     no_fcaps: bool,
     no_acls: bool,
@@ -328,7 +309,6 @@ async fn create_archive(
         entries_max: entries_max as usize,
         device_set,
         patterns,
-        verbose,
         skip_lost_and_found: false,
     };
 
@@ -374,9 +354,7 @@ async fn create_archive(
         writer,
         feature_flags,
         move |path| {
-            if verbose {
-                println!("{:?}", path);
-            }
+            log::debug!("{:?}", path);
             Ok(())
         },
         None,
@@ -418,9 +396,7 @@ async fn mount_archive(
     select! {
         res = session.fuse() => res?,
         _ = interrupt.recv().fuse() => {
-            if verbose {
-                eprintln!("interrupted");
-            }
+            log::debug!("interrupted");
         }
     }
 
@@ -433,24 +409,16 @@ async fn mount_archive(
             archive: {
                 description: "Archive name.",
             },
-            verbose: {
-                description: "Verbose output.",
-                optional: true,
-                default: false,
-            },
         },
     },
 )]
 /// List the contents of an archive.
-fn dump_archive(archive: String, verbose: bool) -> Result<(), Error> {
+fn dump_archive(archive: String) -> Result<(), Error> {
     for entry in pxar::decoder::Decoder::open(archive)? {
         let entry = entry?;
 
-        if verbose {
-            println!("{}", format_single_line_entry(&entry));
-        } else {
-            println!("{:?}", entry.path());
-        }
+        log::debug!("{}", format_single_line_entry(&entry));
+        log::info!("{:?}", entry.path());
     }
     Ok(())
 }
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index ef82b426..23d9bb87 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -1522,7 +1522,7 @@ pub fn pxar_file_download(
                 let (sender, receiver) = tokio::sync::mpsc::channel(100);
                 let channelwriter = AsyncChannelWriter::new(sender, 1024 * 1024);
                 proxmox_rest_server::spawn_internal_task(
-                    create_zip(channelwriter, decoder, path.clone(), false)
+                    create_zip(channelwriter, decoder, path.clone())
                 );
                 Body::wrap_stream(ReceiverStream::new(receiver).map_err(move |err| {
                     eprintln!("error during streaming of zip '{:?}' - {}", path, err);
diff --git a/src/bin/sg-tape-cmd.rs b/src/bin/sg-tape-cmd.rs
index 30d022d7..6fa34878 100644
--- a/src/bin/sg-tape-cmd.rs
+++ b/src/bin/sg-tape-cmd.rs
@@ -35,13 +35,13 @@ fn get_tape_handle(param: &Value) -> Result<LtoTapeHandle, Error> {
     let handle = if let Some(name) = param["drive"].as_str() {
         let (config, _digest) = pbs_config::drive::config()?;
         let drive: LtoTapeDrive = config.lookup("lto", name)?;
-        eprintln!("using device {}", drive.path);
+        log::info!("using device {}", drive.path);
         open_lto_tape_drive(&drive)?
     } else if let Some(device) = param["device"].as_str() {
-        eprintln!("using device {}", device);
+        log::info!("using device {}", device);
         LtoTapeHandle::new(open_lto_tape_device(device)?)?
     } else if let Some(true) = param["stdin"].as_bool() {
-        eprintln!("using stdin");
+        log::info!("using stdin");
         let fd = std::io::stdin().as_raw_fd();
         let file = unsafe { File::from_raw_fd(fd) };
         check_tape_is_lto_tape_device(&file)?;
@@ -49,7 +49,7 @@ fn get_tape_handle(param: &Value) -> Result<LtoTapeHandle, Error> {
     } else if let Ok(name) = std::env::var("PROXMOX_TAPE_DRIVE") {
         let (config, _digest) = pbs_config::drive::config()?;
         let drive: LtoTapeDrive = config.lookup("lto", &name)?;
-        eprintln!("using device {}", drive.path);
+        log::info!("using device {}", drive.path);
         open_lto_tape_drive(&drive)?
     } else {
         let (config, _digest) = pbs_config::drive::config()?;
@@ -63,7 +63,7 @@ fn get_tape_handle(param: &Value) -> Result<LtoTapeHandle, Error> {
         if drive_names.len() == 1 {
             let name = drive_names[0];
             let drive: LtoTapeDrive = config.lookup("lto", name)?;
-            eprintln!("using device {}", drive.path);
+            log::info!("using device {}", drive.path);
             open_lto_tape_drive(&drive)?
         } else {
             bail!("no drive/device specified");
-- 
2.30.2





More information about the pbs-devel mailing list