replace print with log macro

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/examples/upload-speed.rs b/examples/upload-speed.rs
index 3579db9602b65562c6ab1b99be855c5a2fdd3e9c..f9fc52a85f6b828ce3abb8c75f13c7a72ad56f47 100644 (file)
--- a/examples/upload-speed.rs
+++ b/examples/upload-speed.rs
@@ -29,7 +29,7 @@ async fn upload_speed() -> Result<f64, Error> {
     .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 aeb5a71dc0814bd39c29fc7577cb9fd51e761751..676deb593e0aebdcd2fd62cd660645ddd01d125e 100644 (file)
--- a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
+++ b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs
@@ -336,7 +336,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 2e379d8cd6b8b650ff69743fef05c4735421615e..3d440e345995d9feeb6bffeb181a9624c26b962d 100644 (file)
--- a/pxar-bin/Cargo.toml
+++ b/pxar-bin/Cargo.toml
@@ -12,6 +12,7 @@ path = "src/main.rs"
 anyhow = "1.0"
 futures = "0.3"
 nix = "0.24"
+log = "0.4"
 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 e3eba21333abf0a540d77844c5adb2c4a1b86ad0..3714eb032340bfe9e5bd434beb92e4db4f33f362 100644 (file)
--- a/pxar-bin/src/main.rs
+++ b/pxar-bin/src/main.rs
@@ -23,7 +23,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(
@@ -31,9 +30,7 @@ fn extract_archive_from_reader<R: std::io::Read>(
         Path::new(target),
         feature_flags,
         |path| {
-            if verbose {
-                println!("{:?}", path);
-            }
+            log::debug!("{:?}", path);
         },
         options,
     )
@@ -58,11 +55,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,
@@ -116,7 +108,6 @@ fn extract_archive(
     archive: String,
     pattern: Option<Vec<String>>,
     target: Option<String>,
-    verbose: bool,
     no_xattrs: bool,
     no_fcaps: bool,
     no_acls: bool,
@@ -179,7 +170,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>)
@@ -195,14 +186,12 @@ fn extract_archive(
     if archive == "-" {
         let stdin = std::io::stdin();
         let mut reader = stdin.lock();
-        extract_archive_from_reader(&mut reader, target, feature_flags, verbose, options)?;
+        extract_archive_from_reader(&mut reader, target, feature_flags, 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)?;
+        extract_archive_from_reader(&mut reader, target, feature_flags, options)?;
     }
 
     if !was_ok.load(Ordering::Acquire) {
@@ -221,11 +210,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,
@@ -285,7 +269,6 @@ fn extract_archive(
 async fn create_archive(
     archive: String,
     source: String,
-    verbose: bool,
     no_xattrs: bool,
     no_fcaps: bool,
     no_acls: bool,
@@ -318,7 +301,6 @@ async fn create_archive(
         entries_max: entries_max as usize,
         device_set,
         patterns,
-        verbose,
         skip_lost_and_found: false,
     };
 
@@ -363,9 +345,7 @@ async fn create_archive(
         writer,
         feature_flags,
         move |path| {
-            if verbose {
-                println!("{:?}", path);
-            }
+            log::debug!("{:?}", path);
             Ok(())
         },
         None,
@@ -404,9 +384,7 @@ async fn mount_archive(archive: String, mountpoint: String, verbose: bool) -> Re
     select! {
         res = session.fuse() => res?,
         _ = interrupt.recv().fuse() => {
-            if verbose {
-                eprintln!("interrupted");
-            }
+            log::debug!("interrupted");
         }
     }
 
@@ -419,23 +397,18 @@ async fn mount_archive(archive: String, mountpoint: String, verbose: bool) -> Re
             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));
+        if log::log_enabled!(log::Level::Debug) {
+            log::debug!("{}", format_single_line_entry(&entry));
         } else {
-            println!("{:?}", entry.path());
+            log::info!("{:?}", entry.path());
         }
     }
     Ok(())

diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index ad2744b718263c7cc08f3173f65dfe9fcb85e2e6..5448fa102461e221dd669b20f92905a69630bffa 100644 (file)
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -1702,11 +1702,10 @@ pub fn pxar_file_download(
                         channelwriter,
                         decoder,
                         path.clone(),
-                        false,
                     ));
                     let zstdstream = ZstdEncoder::new(ReceiverStream::new(receiver))?;
                     Body::wrap_stream(zstdstream.map_err(move |err| {
-                        eprintln!("error during streaming of tar.zst '{:?}' - {}", path, err);
+                        log::error!("error during streaming of tar.zst '{:?}' - {}", path, err);
                         err
                     }))
                 } else {
@@ -1714,10 +1713,9 @@ pub fn pxar_file_download(
                         channelwriter,
                         decoder,
                         path.clone(),
-                        false,
                     ));
                     Body::wrap_stream(ReceiverStream::new(receiver).map_err(move |err| {
-                        eprintln!("error during streaming of zip '{:?}' - {}", path, err);
+                        log::error!("error during streaming of zip '{:?}' - {}", path, err);
                         err
                     }))
                 }

diff --git a/src/bin/sg-tape-cmd.rs b/src/bin/sg-tape-cmd.rs
index 402fe9cbb76f5a08234319a51c37f20318ae9bc2..c456789670deb7b65e688eea55c3223c82b6ffbd 100644 (file)
--- a/src/bin/sg-tape-cmd.rs
+++ b/src/bin/sg-tape-cmd.rs
@@ -25,13 +25,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)?;
@@ -39,7 +39,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()?;
@@ -55,7 +55,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");