From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A5C6BBC5DD for ; Thu, 28 Mar 2024 14:51:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 995F8C988 for ; Thu, 28 Mar 2024 14:50:33 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 28 Mar 2024 14:50:31 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 85E4F4293F for ; Thu, 28 Mar 2024 14:50:31 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Thu, 28 Mar 2024 14:50:10 +0100 Message-Id: <20240328135028.504520-13-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240328135028.504520-1-a.lauterer@proxmox.com> References: <20240328135028.504520-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.062 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: [pve-devel] [PATCH v3 12/30] auto-installer: add simple logging X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2024 13:51:04 -0000 Log to stdout and the file the binary needs to set up. This is a first variant. By using the log crate macros we can change that in the future without too much effort. Signed-off-by: Aaron Lauterer --- proxmox-auto-installer/Cargo.toml | 2 ++ proxmox-auto-installer/src/lib.rs | 1 + proxmox-auto-installer/src/log.rs | 38 +++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 proxmox-auto-installer/src/log.rs diff --git a/proxmox-auto-installer/Cargo.toml b/proxmox-auto-installer/Cargo.toml index 80de4fa..b1d3e7a 100644 --- a/proxmox-auto-installer/Cargo.toml +++ b/proxmox-auto-installer/Cargo.toml @@ -8,8 +8,10 @@ exclude = [ "build", "debian" ] homepage = "https://www.proxmox.com" [dependencies] +anyhow = "1.0" proxmox-installer-common = { path = "../proxmox-installer-common" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" toml = "0.7" enum-iterator = "0.6.0" +log = "0.4.20" diff --git a/proxmox-auto-installer/src/lib.rs b/proxmox-auto-installer/src/lib.rs index 72884c1..6636cc7 100644 --- a/proxmox-auto-installer/src/lib.rs +++ b/proxmox-auto-installer/src/lib.rs @@ -1,3 +1,4 @@ pub mod answer; +pub mod log; pub mod udevinfo; pub mod utils; diff --git a/proxmox-auto-installer/src/log.rs b/proxmox-auto-installer/src/log.rs new file mode 100644 index 0000000..d52912a --- /dev/null +++ b/proxmox-auto-installer/src/log.rs @@ -0,0 +1,38 @@ +use anyhow::{bail, Result}; +use log::{Level, Metadata, Record}; +use std::{fs::File, io::Write, sync::Mutex, sync::OnceLock}; + +pub struct AutoInstLogger; +static LOGFILE: OnceLock> = OnceLock::new(); + +impl AutoInstLogger { + pub fn init(path: &str) -> Result<()> { + let f = File::create(path)?; + if LOGFILE.set(Mutex::new(f)).is_err() { + bail!("Cannot set LOGFILE") + } + Ok(()) + } +} + +impl log::Log for AutoInstLogger { + fn enabled(&self, metadata: &Metadata) -> bool { + metadata.level() <= Level::Info + } + + /// Logs to stdout without log level and into log file including log level + fn log(&self, record: &Record) { + if self.enabled(record.metadata()) { + println!("{}", record.args()); + let mut file = LOGFILE + .get() + .expect("could not get LOGFILE") + .lock() + .expect("could not get mutex for LOGFILE"); + file.write_all(format!("{} - {}\n", record.level(), record.args()).as_bytes()) + .expect("could not write to LOGFILE"); + } + } + + fn flush(&self) {} +} -- 2.39.2