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 3B4441FF38F for ; Tue, 21 May 2024 15:31:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 912D619163; Tue, 21 May 2024 15:31:56 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Tue, 21 May 2024 15:31:41 +0200 Message-Id: <20240521133148.223266-2-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240521133148.223266-1-l.wagner@proxmox.com> References: <20240521133148.223266-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.003 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 proxmox-perl-rs v3 1/8] notify: use file based notification templates 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Instead of passing literal template strings to the notification system, we now only pass an identifier. This identifier will be used load the template files from a product-specific directory. Signed-off-by: Lukas Wagner --- common/src/notify.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/common/src/notify.rs b/common/src/notify.rs index 8f9f38f..d965417 100644 --- a/common/src/notify.rs +++ b/common/src/notify.rs @@ -94,16 +94,14 @@ mod export { fn send( #[try_from_ref] this: &NotificationConfig, severity: Severity, - title: String, - body: String, + template_name: String, template_data: Option, fields: Option>, ) -> Result<(), HttpError> { let config = this.config.lock().unwrap(); - let notification = Notification::new_templated( + let notification = Notification::from_template( severity, - title, - body, + template_name, template_data.unwrap_or_default(), fields.unwrap_or_default(), ); -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel