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 [212.224.123.68])
	by lore.proxmox.com (Postfix) with ESMTPS id 6103C1FF16E
	for <inbox@lore.proxmox.com>; Mon, 14 Apr 2025 16:46:10 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id 6AF0336456;
	Mon, 14 Apr 2025 16:46:10 +0200 (CEST)
Date: Mon, 14 Apr 2025 16:46:07 +0200
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Lukas Wagner <l.wagner@proxmox.com>
Message-ID: <lyjvi2r5v53muzyk63jozsjp4dd4yeiwbkhrmpgwcootjjw6ju@onw7zivocgmm>
References: <20250411121028.265555-1-l.wagner@proxmox.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20250411121028.265555-1-l.wagner@proxmox.com>
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.082 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: [pdm-devel] applied: [PATCH proxmox-datacenter-manager v2] 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>
Cc: 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>

applied, thanks

On Fri, Apr 11, 2025 at 02:10:28PM +0200, Lukas Wagner wrote:
> The Logger::tasklog_pbs is actually not specific to PBS but should be
> used for anything that uses WorkerTasks with a LogContext.
> 
> Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
> Reviewed-by: Gabriel Goller <g.goller@proxmox.com>
> ---
> 
> Notes:
>     We might want to rename Logger::tasklog_pbs 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