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 7AC701FF2A0 for ; Mon, 15 Jul 2024 17:12:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7EBB85C3B; Mon, 15 Jul 2024 17:13:07 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Mon, 15 Jul 2024 17:13:00 +0200 Message-ID: <20240715151301.550787-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.052 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 proxmox-backup] log: retrieve `ReaderEnvironment` debug flag from 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" Don't hardcode the debug flag but retrieve the currently enabled level using tracing. This will change the default log-behavior and disable some logs that have been printed previously. F.e.: the "protocol upgrade done" message is not visible anymore per default because it is printed with debug. Signed-off-by: Gabriel Goller --- Note that this still keeps the behavior of the client controlling the log-level of the server, except if the server has a minimum log level of warn. src/api2/backup/environment.rs | 11 ++++++++--- src/api2/reader/environment.rs | 2 +- src/server/pull.rs | 11 +++++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs index 51f4a15b3c95..5bd508d00753 100644 --- a/src/api2/backup/environment.rs +++ b/src/api2/backup/environment.rs @@ -2,6 +2,7 @@ use anyhow::{bail, format_err, Error}; use nix::dir::Dir; use std::collections::HashMap; use std::sync::{Arc, Mutex}; +use tracing::info; use ::serde::Serialize; use serde_json::{json, Value}; @@ -141,7 +142,7 @@ impl BackupEnvironment { auth_id, worker, datastore, - debug: false, + debug: tracing::enabled!(tracing::Level::DEBUG), formatter: JSON_FORMATTER, backup_dir, last_backup: None, @@ -687,12 +688,16 @@ impl BackupEnvironment { } pub fn log>(&self, msg: S) { - self.worker.log_message(msg); + info!("{}", msg.as_ref()); } pub fn debug>(&self, msg: S) { if self.debug { - self.worker.log_message(msg); + // This is kinda weird, we would like to use debug! here and automatically filter it, + // but self.debug is set from the client-side and the logs are printed on client and + // server side. This means that if the client sets the log level to debug, both server + // and client need to have 'debug' logs printed. + info!("{}", msg.as_ref()); } } diff --git a/src/api2/reader/environment.rs b/src/api2/reader/environment.rs index 37039da2f573..25593bd0eeba 100644 --- a/src/api2/reader/environment.rs +++ b/src/api2/reader/environment.rs @@ -39,7 +39,7 @@ impl ReaderEnvironment { auth_id, worker, datastore, - debug: false, + debug: tracing::enabled!(tracing::Level::DEBUG), formatter: JSON_FORMATTER, backup_dir, allowed_chunks: Arc::new(RwLock::new(HashSet::new())), diff --git a/src/server/pull.rs b/src/server/pull.rs index 1ff9b92ab177..ff4b3a4168fa 100644 --- a/src/server/pull.rs +++ b/src/server/pull.rs @@ -278,8 +278,15 @@ impl PullSource for RemoteSource { ns: &BackupNamespace, dir: &BackupDir, ) -> Result, Error> { - let backup_reader = - BackupReader::start(&self.client, None, self.repo.store(), ns, dir, true).await?; + let backup_reader = BackupReader::start( + &self.client, + None, + self.repo.store(), + ns, + dir, + tracing::enabled!(tracing::Level::DEBUG), + ) + .await?; Ok(Arc::new(RemoteReader { backup_reader, dir: dir.clone(), -- 2.43.0 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel