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 3989D1FF16E for ; Mon, 9 Dec 2024 11:46:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CF8282F111; Mon, 9 Dec 2024 11:46:41 +0100 (CET) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Mon, 9 Dec 2024 11:46:06 +0100 Message-Id: <20241209104606.263045-5-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241209104606.263045-1-g.goller@proxmox.com> References: <20241209104606.263045-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.036 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 Subject: [pbs-devel] [PATCH proxmox-perl-rs v2 4/4] log: use new init function, print to stderr and journald 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 Cc: Lukas Wagner Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Use the new init function. Print the logs to stderr and journald always. Remove the log dependency. Suggested-by: Lukas Wagner Signed-off-by: Gabriel Goller --- common/src/logger.rs | 4 +++- pmg-rs/Cargo.toml | 1 - pmg-rs/src/lib.rs | 2 +- pve-rs/Cargo.toml | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/logger.rs b/common/src/logger.rs index 1c8940ba4588..5edb08a45f39 100644 --- a/common/src/logger.rs +++ b/common/src/logger.rs @@ -5,7 +5,9 @@ pub fn init(env_var_name: &str, default_log_level: &str) { if let Err(e) = default_log_level .parse() .map_err(Error::from) - .and_then(|default_log_level| proxmox_log::init_logger(env_var_name, default_log_level)) + .and_then(|default_log_level| { + proxmox_log::init::stderr_and_journald_with_pve_format(env_var_name, default_log_level) + }) { eprintln!("could not set up env_logger: {e:?}"); } diff --git a/pmg-rs/Cargo.toml b/pmg-rs/Cargo.toml index 12526714f060..137434d227ac 100644 --- a/pmg-rs/Cargo.toml +++ b/pmg-rs/Cargo.toml @@ -18,7 +18,6 @@ anyhow = "1.0" hex = "0.4" http = "0.2.7" libc = "0.2" -log = "0.4.17" nix = "0.26" openssl = "0.10.40" serde = "1.0" diff --git a/pmg-rs/src/lib.rs b/pmg-rs/src/lib.rs index 3db6966ab263..0ebe2855f8c4 100644 --- a/pmg-rs/src/lib.rs +++ b/pmg-rs/src/lib.rs @@ -29,7 +29,7 @@ mod export { } pub fn send_updates_available(_updates: &[&APTUpdateInfo]) -> Result<(), Error> { - log::warn!("update notifications are not implemented for PMG yet"); + tracing::warn!("update notifications are not implemented for PMG yet"); Ok(()) } diff --git a/pve-rs/Cargo.toml b/pve-rs/Cargo.toml index 4b6dec6ff452..8eb7bbdf61eb 100644 --- a/pve-rs/Cargo.toml +++ b/pve-rs/Cargo.toml @@ -20,7 +20,6 @@ base64 = "0.13" hex = "0.4" http = "0.2.7" libc = "0.2" -log = "0.4.17" nix = "0.26" openssl = "0.10.40" serde = "1.0" -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel