From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 03FD31FF163 for ; Thu, 29 Aug 2024 15:40:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B9E7C1CB54; Thu, 29 Aug 2024 15:40:47 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Thu, 29 Aug 2024 15:40:40 +0200 Message-Id: <20240829134040.335400-2-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240829134040.335400-1-g.goller@proxmox.com> References: <20240829134040.335400-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.041 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup v2 1/2] move client binaries to tracing 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" Add tracing logger to all client binaries and remove env_logger. The reason for this change is twofold: our migration to tracing, and the behavior when the client calls an api handler directly. Currently the proxmox-backup-manager calls the api handlers directly for some commands. This results in no output (on console and task log), as no tracing logger is instantiated. Signed-off-by: Gabriel Goller --- pbs-tape/Cargo.toml | 1 + pbs-tape/src/bin/pmt.rs | 3 ++- pbs-tape/src/bin/pmtx.rs | 3 ++- proxmox-backup-client/Cargo.toml | 1 + proxmox-backup-client/src/main.rs | 3 ++- proxmox-file-restore/Cargo.toml | 1 + proxmox-file-restore/src/main.rs | 11 ++++++----- pxar-bin/Cargo.toml | 1 + pxar-bin/src/main.rs | 3 ++- src/bin/proxmox-backup-debug.rs | 5 +++-- src/bin/proxmox-backup-manager.rs | 3 ++- src/bin/proxmox-tape.rs | 3 ++- src/bin/sg-tape-cmd.rs | 3 ++- 13 files changed, 27 insertions(+), 14 deletions(-) diff --git a/pbs-tape/Cargo.toml b/pbs-tape/Cargo.toml index 142bbacd7daf..4f153fedad8f 100644 --- a/pbs-tape/Cargo.toml +++ b/pbs-tape/Cargo.toml @@ -23,6 +23,7 @@ udev.workspace = true proxmox-io.workspace = true proxmox-lang.workspace=true +proxmox-log.workspace=true proxmox-sys.workspace = true proxmox-time.workspace = true proxmox-uuid.workspace = true diff --git a/pbs-tape/src/bin/pmt.rs b/pbs-tape/src/bin/pmt.rs index 4a5e08e5ea48..9e39dbe16b2f 100644 --- a/pbs-tape/src/bin/pmt.rs +++ b/pbs-tape/src/bin/pmt.rs @@ -15,6 +15,7 @@ use anyhow::{bail, Error}; use serde_json::Value; +use proxmox_log::init_cli_logger; use proxmox_router::cli::*; use proxmox_router::RpcEnvironment; use proxmox_schema::{api, ArraySchema, IntegerSchema, Schema, StringSchema}; @@ -799,7 +800,7 @@ fn options( } fn main() -> Result<(), Error> { - init_cli_logger("PBS_LOG", "info"); + init_cli_logger("PBS_LOG", proxmox_log::LevelFilter::INFO)?; let uid = nix::unistd::Uid::current(); diff --git a/pbs-tape/src/bin/pmtx.rs b/pbs-tape/src/bin/pmtx.rs index 6f34bc448ad5..303353e6bfd3 100644 --- a/pbs-tape/src/bin/pmtx.rs +++ b/pbs-tape/src/bin/pmtx.rs @@ -16,6 +16,7 @@ use std::fs::File; use anyhow::{bail, Error}; use serde_json::Value; +use proxmox_log::init_cli_logger; use proxmox_router::cli::*; use proxmox_router::RpcEnvironment; use proxmox_schema::api; @@ -387,7 +388,7 @@ fn scan(param: Value) -> Result<(), Error> { } fn main() -> Result<(), Error> { - init_cli_logger("PBS_LOG", "info"); + init_cli_logger("PBS_LOG", proxmox_log::LevelFilter::INFO)?; let uid = nix::unistd::Uid::current(); diff --git a/proxmox-backup-client/Cargo.toml b/proxmox-backup-client/Cargo.toml index 62dd97f9ce21..a91a4908ba05 100644 --- a/proxmox-backup-client/Cargo.toml +++ b/proxmox-backup-client/Cargo.toml @@ -24,6 +24,7 @@ pxar.workspace = true proxmox-async.workspace = true proxmox-human-byte.workspace = true +proxmox-log.workspace = true proxmox-io.workspace = true proxmox-router = { workspace = true, features = [ "cli" ] } proxmox-schema = { workspace = true, features = [ "api-macro" ] } diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index 5edb2a824ef9..b59b560e6834 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -17,6 +17,7 @@ use pathpatterns::{MatchEntry, MatchType, PatternFlag}; use proxmox_async::blocking::TokioWriterAdapter; use proxmox_human_byte::HumanByte; use proxmox_io::StdChannelWriter; +use proxmox_log::init_cli_logger; use proxmox_router::{cli::*, ApiMethod, RpcEnvironment}; use proxmox_schema::api; use proxmox_sys::fs::{file_get_json, image_size, replace_file, CreateOptions}; @@ -1953,7 +1954,7 @@ impl ReadAt for BufferedDynamicReadAt { fn main() { pbs_tools::setup_libc_malloc_opts(); - init_cli_logger("PBS_LOG", "info"); + init_cli_logger("PBS_LOG", proxmox_log::LevelFilter::INFO).expect("failed to initiate logger"); let backup_cmd_def = CliCommand::new(&API_METHOD_CREATE_BACKUP) .arg_param(&["backupspec"]) diff --git a/proxmox-file-restore/Cargo.toml b/proxmox-file-restore/Cargo.toml index f536e38d4afd..8f99ecf9b96e 100644 --- a/proxmox-file-restore/Cargo.toml +++ b/proxmox-file-restore/Cargo.toml @@ -21,6 +21,7 @@ pxar.workspace = true proxmox-async.workspace = true proxmox-compression.workspace = true proxmox-lang.workspace=true +proxmox-log.workspace=true proxmox-router = { workspace = true, features = [ "cli" ] } proxmox-schema = { workspace = true, features = [ "api-macro" ] } proxmox-sys = { workspace = true, features = [ "logrotate" ] } diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs index 69d811fc1f0b..cda4e911c545 100644 --- a/proxmox-file-restore/src/main.rs +++ b/proxmox-file-restore/src/main.rs @@ -9,10 +9,11 @@ use serde_json::{json, Value}; use tokio::io::AsyncWriteExt; use proxmox_compression::zstd::ZstdEncoder; +use proxmox_log::init_cli_logger; use proxmox_router::cli::{ complete_file_name, default_table_format_options, format_and_print_result_full, - get_output_format, init_cli_logger, run_cli_command, CliCommand, CliCommandMap, CliEnvironment, - ColumnConfig, OUTPUT_FORMAT, + get_output_format, run_cli_command, CliCommand, CliCommandMap, CliEnvironment, ColumnConfig, + OUTPUT_FORMAT, }; use proxmox_router::{http_err, HttpError}; use proxmox_schema::api; @@ -645,10 +646,10 @@ where fn main() { let loglevel = match qemu_helper::debug_mode() { - true => "debug", - false => "info", + true => proxmox_log::LevelFilter::DEBUG, + false => proxmox_log::LevelFilter::INFO, }; - init_cli_logger("PBS_LOG", loglevel); + init_cli_logger("PBS_LOG", loglevel).expect("failed to initiate logger"); let list_cmd_def = CliCommand::new(&API_METHOD_LIST) .arg_param(&["snapshot", "path"]) diff --git a/pxar-bin/Cargo.toml b/pxar-bin/Cargo.toml index d33b7174f9f1..64dcf1496b4d 100644 --- a/pxar-bin/Cargo.toml +++ b/pxar-bin/Cargo.toml @@ -21,6 +21,7 @@ pxar.workspace = true proxmox-async.workspace = true proxmox-human-byte.workspace = true +proxmox-log.workspace = true proxmox-router = { workspace = true, features = ["cli", "server"] } proxmox-schema = { workspace = true, features = [ "api-macro" ] } proxmox-sys.workspace = true diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs index 6549ccf13963..71ce3bf78f52 100644 --- a/pxar-bin/src/main.rs +++ b/pxar-bin/src/main.rs @@ -19,6 +19,7 @@ use pbs_client::pxar::{ use pxar::EntryKind; use proxmox_human_byte::HumanByte; +use proxmox_log::init_cli_logger; use proxmox_router::cli::*; use proxmox_schema::api; @@ -568,7 +569,7 @@ fn dump_archive(archive: String, payload_input: Option) -> Result<(), Er } fn main() { - init_cli_logger("PXAR_LOG", "info"); + init_cli_logger("PXAR_LOG", proxmox_log::LevelFilter::INFO).expect("failed to initiate logger"); let cmd_def = CliCommandMap::new() .insert( diff --git a/src/bin/proxmox-backup-debug.rs b/src/bin/proxmox-backup-debug.rs index a3589c1673dd..35ad11c70e7e 100644 --- a/src/bin/proxmox-backup-debug.rs +++ b/src/bin/proxmox-backup-debug.rs @@ -1,5 +1,6 @@ +use proxmox_log::init_cli_logger; use proxmox_router::{ - cli::{init_cli_logger, run_cli_command, CliCommandMap, CliEnvironment}, + cli::{run_cli_command, CliCommandMap, CliEnvironment}, RpcEnvironment, }; @@ -7,7 +8,7 @@ mod proxmox_backup_debug; use proxmox_backup_debug::*; fn main() { - init_cli_logger("PBS_LOG", "info"); + init_cli_logger("PBS_LOG", proxmox_log::LevelFilter::INFO).expect("failed to initiate logger"); let cmd_def = CliCommandMap::new() .insert("inspect", inspect::inspect_commands()) diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs index 385142df70ac..420e96665662 100644 --- a/src/bin/proxmox-backup-manager.rs +++ b/src/bin/proxmox-backup-manager.rs @@ -3,6 +3,7 @@ use std::io::{self, Write}; use std::str::FromStr; use anyhow::{format_err, Error}; +use proxmox_log::init_cli_logger; use serde_json::{json, Value}; use proxmox_router::{cli::*, RpcEnvironment}; @@ -491,7 +492,7 @@ async fn get_versions(verbose: bool, param: Value) -> Result { } async fn run() -> Result<(), Error> { - init_cli_logger("PBS_LOG", "info"); + init_cli_logger("PBS_LOG", proxmox_log::LevelFilter::INFO)?; proxmox_backup::server::notifications::init()?; let cmd_def = CliCommandMap::new() diff --git a/src/bin/proxmox-tape.rs b/src/bin/proxmox-tape.rs index 83793c346051..8e8584b35637 100644 --- a/src/bin/proxmox-tape.rs +++ b/src/bin/proxmox-tape.rs @@ -5,6 +5,7 @@ use serde_json::{json, Value}; use proxmox_human_byte::HumanByte; use proxmox_io::ReadExt; +use proxmox_log::init_cli_logger; use proxmox_router::cli::*; use proxmox_router::RpcEnvironment; use proxmox_schema::api; @@ -997,7 +998,7 @@ async fn catalog_media(mut param: Value) -> Result<(), Error> { } fn main() { - init_cli_logger("PBS_LOG", "info"); + init_cli_logger("PBS_LOG", proxmox_log::LevelFilter::INFO).expect("failed to initiate logger"); let cmd_def = CliCommandMap::new() .insert( diff --git a/src/bin/sg-tape-cmd.rs b/src/bin/sg-tape-cmd.rs index 56399044d3d5..cd14b660a68a 100644 --- a/src/bin/sg-tape-cmd.rs +++ b/src/bin/sg-tape-cmd.rs @@ -10,6 +10,7 @@ use pbs_tape::sg_tape::SgTape; use proxmox_backup::tape::encryption_keys::load_key; use serde_json::Value; +use proxmox_log::init_cli_logger; use proxmox_router::{cli::*, RpcEnvironment}; use proxmox_schema::api; use proxmox_uuid::Uuid; @@ -124,7 +125,7 @@ fn set_encryption( } fn main() -> Result<(), Error> { - init_cli_logger("PBS_LOG", "info"); + init_cli_logger("PBS_LOG", proxmox_log::LevelFilter::INFO)?; // check if we are user root or backup let backup_uid = pbs_config::backup_user()?.uid; -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel