From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 2C6171FF15C for ; Wed, 30 Oct 2024 14:55:54 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5A7371A58A; Wed, 30 Oct 2024 14:55:57 +0100 (CET) From: Filip Schauer To: pbs-devel@lists.proxmox.com Date: Wed, 30 Oct 2024 14:55:36 +0100 Message-Id: <20241030135537.92595-6-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241030135537.92595-1-f.schauer@proxmox.com> References: <20241030135537.92595-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.033 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH vma-to-pbs v4 5/6] use level-based logging instead of println X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Use log level "info" by default and prevent spamming messages for every single chunk uploaded. To re-enable these messages, set the RUST_LOG environment variable to "debug". Signed-off-by: Filip Schauer --- Cargo.toml | 2 ++ src/main.rs | 28 ++++++++++++++++++++++------ src/vma2pbs.rs | 38 ++++++++++++++++++++------------------ 3 files changed, 44 insertions(+), 24 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5c6a175..0f4b2a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,8 +8,10 @@ edition = "2021" anyhow = "1.0" bincode = "1.3" chrono = "0.4" +env_logger = "0.10" hyper = "0.14.5" itertools = "0.13" +log = "0.4" pico-args = "0.5" md5 = "0.7.0" regex = "1.7" diff --git a/src/main.rs b/src/main.rs index 4e3a91b..22804ee 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,6 +5,7 @@ use std::path::PathBuf; use anyhow::{bail, Context, Error}; use chrono::NaiveDateTime; +use env_logger::Target; use itertools::Itertools; use proxmox_sys::linux::tty; use proxmox_time::epoch_i64; @@ -128,7 +129,7 @@ fn parse_args() -> Result { match (encrypt, keyfile.is_some()) { (true, false) => bail!("--encrypt requires a --keyfile!"), - (false, true) => println!( + (false, true) => log::info!( "--keyfile given, but --encrypt not set -> backup will be signed, but not encrypted!" ), _ => {} @@ -190,7 +191,7 @@ fn parse_args() -> Result { Some(key_password) } else if vma_file_path.is_none() { - println!( + log::info!( "Please use --key-password-file to provide the password when passing the VMA file \ to stdin, if required." ); @@ -246,13 +247,17 @@ fn parse_args() -> Result { let Some((_, [backup_id, timestr, ext])) = re.captures(file_name).map(|c| c.extract()) else { - // Skip the file, since it is not a VMA backup + log::debug!("Skip \"{file_name}\", since it is not a VMA backup"); continue; }; if let Some(ref vmid) = vmid { if backup_id != vmid { - // Skip the backup, since it does not match the specified vmid + log::debug!( + "Skip backup with VMID {}, since it does not match specified VMID {}", + backup_id, + vmid + ); continue; } } @@ -300,14 +305,14 @@ fn parse_args() -> Result { .collect(); grouped_vmas.sort_by_key(|d| d[0].backup_id.clone()); - println!( + log::info!( "Found {} backup archive(s) of {} different VMID(s):", total_vma_count, grouped_vmas.len() ); for vma_group in &grouped_vmas { - println!( + log::info!( "- VMID {}: {} backups", vma_group[0].backup_id, vma_group.len() @@ -352,7 +357,18 @@ fn parse_args() -> Result { Ok(options) } +fn init_cli_logger() { + env_logger::Builder::from_env(env_logger::Env::new().filter_or("RUST_LOG", "info")) + .format_level(false) + .format_target(false) + .format_timestamp(None) + .target(Target::Stdout) + .init(); +} + fn main() -> Result<(), Error> { + init_cli_logger(); + let args = parse_args()?; vma2pbs(args)?; diff --git a/src/vma2pbs.rs b/src/vma2pbs.rs index 497f3ae..a5907ed 100644 --- a/src/vma2pbs.rs +++ b/src/vma2pbs.rs @@ -82,8 +82,8 @@ fn create_pbs_backup_task( pbs_args: &PbsArgs, backup_args: &VmaBackupArgs, ) -> Result<*mut ProxmoxBackupHandle, Error> { - println!( - "backup time: {}", + log::info!( + "\tbackup time: {}", epoch_to_rfc3339(backup_args.backup_time)? ); @@ -152,7 +152,7 @@ where let config_name = config.name; let config_data = config.content; - println!("CFG: size: {} name: {}", config_data.len(), config_name); + log::info!("\tCFG: size: {} name: {}", config_data.len(), config_name); let config_name_cstr = CString::new(config_name)?; @@ -190,9 +190,11 @@ where let device_name = vma_reader.get_device_name(device_id.try_into()?)?; let device_size = vma_reader.get_device_size(device_id.try_into()?)?; - println!( - "DEV: dev_id={} size: {} devname: {}", - device_id, device_size, device_name + log::info!( + "\tDEV: dev_id={} size: {} devname: {}", + device_id, + device_size, + device_name ); let device_name_cstr = CString::new(device_name)?; @@ -276,8 +278,8 @@ where }; let pbs_upload_chunk = |pbs_chunk_buffer: Option<&[u8]>| { - println!( - "Uploading dev_id: {} offset: {:#0X} - {:#0X}", + log::debug!( + "\tUploading dev_id: {} offset: {:#0X} - {:#0X}", dev_id, pbs_chunk_offset, pbs_chunk_offset + pbs_chunk_size, @@ -466,13 +468,13 @@ fn set_notes( pub fn vma2pbs(args: BackupVmaToPbsArgs) -> Result<(), Error> { let pbs_args = &args.pbs_args; - println!("PBS repository: {}", pbs_args.pbs_repository); + log::info!("PBS repository: {}", pbs_args.pbs_repository); if let Some(ns) = &pbs_args.namespace { - println!("PBS namespace: {}", ns); + log::info!("PBS namespace: {}", ns); } - println!("PBS fingerprint: {}", pbs_args.fingerprint); - println!("compress: {}", pbs_args.compress); - println!("encrypt: {}", pbs_args.encrypt); + log::info!("PBS fingerprint: {}", pbs_args.fingerprint); + log::info!("compress: {}", pbs_args.compress); + log::info!("encrypt: {}", pbs_args.encrypt); let start_transfer_time = SystemTime::now(); @@ -486,8 +488,8 @@ pub fn vma2pbs(args: BackupVmaToPbsArgs) -> Result<(), Error> { ); if args.skip_failed { - eprintln!("{}", err_msg); - println!("Skipping VMID {}", backup_args.backup_id); + log::warn!("{}", err_msg); + log::info!("Skipping VMID {}", backup_args.backup_id); break; } else { bail!(err_msg); @@ -501,15 +503,15 @@ pub fn vma2pbs(args: BackupVmaToPbsArgs) -> Result<(), Error> { let minutes = total_seconds / 60; let seconds = total_seconds % 60; let milliseconds = transfer_duration.as_millis() % 1000; - println!("Backup finished within {minutes} minutes, {seconds} seconds and {milliseconds} ms"); + log::info!("Backup finished within {minutes} minutes, {seconds} seconds and {milliseconds} ms"); Ok(()) } fn upload_vma_file(pbs_args: &PbsArgs, backup_args: &VmaBackupArgs) -> Result<(), Error> { match &backup_args.vma_file_path { - Some(vma_file_path) => println!("Uploading VMA backup from {:?}", vma_file_path), - None => println!("Uploading VMA backup from (stdin)"), + Some(vma_file_path) => log::info!("Uploading VMA backup from {:?}", vma_file_path), + None => log::info!("Uploading VMA backup from (stdin)"), }; let vma_file: Box = match &backup_args.compression { -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel