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 5E7591FF15C for ; Wed, 21 Aug 2024 12:19:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D90A517175; Wed, 21 Aug 2024 12:19:25 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Wed, 21 Aug 2024 12:19:18 +0200 Message-Id: <20240821101919.217238-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.043 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs, lib.rs] Subject: [pbs-devel] [PATCH] add tracing init_cli_logger and remove old one 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" Remove the proxmox-router init_cli_logger function used in client binaries such as `proxmox-backup-client`, `proxmox-backup-manager`, 'pxar', etc... Add a new init_cli_logger function that uses tracing instead of env_logger. It checks if the task is in a workertask and prints the message either to stdout or to the tasklog (this is neccessary for commands in proxmox-backup-manager that call api handlers that start workerthreads from the client). Signed-off-by: Gabriel Goller --- proxmox-log/src/lib.rs | 37 ++++++++++++++++++++++++++++++++++- proxmox-router/src/cli/mod.rs | 13 ------------ 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/proxmox-log/src/lib.rs b/proxmox-log/src/lib.rs index 796d10145b9e..806d16a68d32 100644 --- a/proxmox-log/src/lib.rs +++ b/proxmox-log/src/lib.rs @@ -8,7 +8,8 @@ use std::sync::{Arc, Mutex}; use tokio::task::futures::TaskLocalFuture; use tracing::Level; use tracing_log::{AsLog, LogTracer}; -use tracing_subscriber::filter::{filter_fn, LevelFilter}; +use tracing_subscriber::filter::filter_fn; +pub use tracing_subscriber::filter::LevelFilter; use tracing_subscriber::prelude::*; use tasklog_layer::TasklogLayer; @@ -125,3 +126,37 @@ impl LogContext { &self.logger } } + +/// Initialize default logger for CLI binaries +pub fn init_cli_logger( + env_var_name: &str, + default_log_level: LevelFilter, +) -> Result<(), anyhow::Error> { + let mut log_level = default_log_level; + if let Ok(v) = env::var(env_var_name) { + if let Ok(l) = v.parse::() { + log_level = l; + } + } + + let format = tracing_subscriber::fmt::format() + .with_level(false) + .without_time() + .with_target(false) + .compact(); + + let registry = tracing_subscriber::registry() + .with( + tracing_subscriber::fmt::layer() + .event_format(format) + .with_filter(filter_fn(|metadata| { + !LogContext::exists() || *metadata.level() >= Level::ERROR + })) + .with_filter(log_level), + ) + .with(TasklogLayer {}.with_filter(log_level)); + + tracing::subscriber::set_global_default(registry)?; + LogTracer::init_with_filter(log_level.as_log())?; + Ok(()) +} diff --git a/proxmox-router/src/cli/mod.rs b/proxmox-router/src/cli/mod.rs index 3cc41ab3ea94..148edb467494 100644 --- a/proxmox-router/src/cli/mod.rs +++ b/proxmox-router/src/cli/mod.rs @@ -57,19 +57,6 @@ pub use readline::*; /// return a list of all possible values. pub type CompletionFunction = fn(&str, &HashMap) -> Vec; -/// Initialize default logger for CLI binaries -pub fn init_cli_logger(env_var_name: &str, default_log_level: &str) { - env_logger::Builder::from_env( - env_logger::Env::new().filter_or(env_var_name, default_log_level), - ) - .write_style(env_logger::WriteStyle::Never) - .format_level(false) - .format_module_path(false) - .format_target(false) - .format_timestamp(None) - .init(); -} - #[derive(Clone, Copy, PartialEq, Eq, Debug)] /// Use for simple yes or no questions, where booleans can be confusing, especially if there's a /// default response to consider. The implementation provides query helper for the CLI. -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel