From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pdm-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id DC8EE1FF164 for <inbox@lore.proxmox.com>; Fri, 11 Apr 2025 13:32:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 84F89181BF; Fri, 11 Apr 2025 13:32:54 +0200 (CEST) From: Lukas Wagner <l.wagner@proxmox.com> To: pdm-devel@lists.proxmox.com Date: Fri, 11 Apr 2025 13:32:47 +0200 Message-Id: <20250411113247.230001-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [main.rs] Subject: [pdm-devel] [PATCH proxmox-datacenter-manager] api: priv-api: admin-cli: use new logger builder X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion <pdm-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/> List-Post: <mailto:pdm-devel@lists.proxmox.com> List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox Datacenter Manager development discussion <pdm-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" <pdm-devel-bounces@lists.proxmox.com> Signed-off-by: Lukas Wagner <l.wagner@proxmox.com> --- Notes: The Logger::tasklog_pbs is actually not specific to PBS but should be used for anything that uses WorkerTasks with a LogContext, as far as I can tell. We might want to rename it at some point. cli/admin/src/main.rs | 5 ++++- server/src/bin/proxmox-datacenter-api/main.rs | 6 +++++- server/src/bin/proxmox-datacenter-privileged-api.rs | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/cli/admin/src/main.rs b/cli/admin/src/main.rs index 5fa9116b..91b93f3c 100644 --- a/cli/admin/src/main.rs +++ b/cli/admin/src/main.rs @@ -4,7 +4,10 @@ mod remotes; fn main() { //pbs_tools::setup_libc_malloc_opts(); // TODO: move from PBS to proxmox-sys and uncomment - proxmox_log::init_cli_logger("PDM_LOG", proxmox_log::LevelFilter::INFO) + + proxmox_log::Logger::from_env("PDM_LOG", proxmox_log::LevelFilter::INFO) + .stderr() + .init() .expect("failed to set up logger"); server::context::init().expect("could not set up server context"); diff --git a/server/src/bin/proxmox-datacenter-api/main.rs b/server/src/bin/proxmox-datacenter-api/main.rs index 25852c8c..771fe45f 100644 --- a/server/src/bin/proxmox-datacenter-api/main.rs +++ b/server/src/bin/proxmox-datacenter-api/main.rs @@ -46,7 +46,11 @@ fn main() -> Result<(), Error> { server::env::sanitize_environment_vars(); let debug = std::env::var("PROXMOX_DEBUG").is_ok(); - proxmox_log::init_logger("PROXMOX_DEBUG", LevelFilter::INFO)?; + + proxmox_log::Logger::from_env("PROXMOX_DEBUG", LevelFilter::INFO) + .journald_on_no_workertask() + .tasklog_pbs() + .init()?; if std::env::args().nth(1).is_some() { bail!("unexpected command line parameters"); diff --git a/server/src/bin/proxmox-datacenter-privileged-api.rs b/server/src/bin/proxmox-datacenter-privileged-api.rs index 0e23a5f1..1f8a947c 100644 --- a/server/src/bin/proxmox-datacenter-privileged-api.rs +++ b/server/src/bin/proxmox-datacenter-privileged-api.rs @@ -23,7 +23,10 @@ fn main() -> Result<(), Error> { server::env::sanitize_environment_vars(); - proxmox_log::init_logger("PROXMOX_DEBUG", LevelFilter::INFO)?; + proxmox_log::Logger::from_env("PROXMOX_DEBUG", LevelFilter::INFO) + .journald_on_no_workertask() + .tasklog_pbs() + .init()?; create_directories()?; -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel