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 8F5AB1FF38F for ; Tue, 21 May 2024 15:31:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7FA1219200; Tue, 21 May 2024 15:31:57 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Tue, 21 May 2024 15:31:44 +0200 Message-Id: <20240521133148.223266-5-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 cluster v3 4/8] notify: use named template instead of passing template strings 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" The notification system will now load template files from a defined location. The template to use is now passed to proxmox_notify, instead of separate template strings for subject/body. Signed-off-by: Lukas Wagner --- src/PVE/Notify.pm | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/PVE/Notify.pm b/src/PVE/Notify.pm index 872eb25..c514111 100644 --- a/src/PVE/Notify.pm +++ b/src/PVE/Notify.pm @@ -58,17 +58,16 @@ sub write_config { } my $send_notification = sub { - my ($severity, $title, $message, $template_data, $fields, $config) = @_; + my ($severity, $template_name, $template_data, $fields, $config) = @_; $config = read_config() if !defined($config); - $config->send($severity, $title, $message, $template_data, $fields); + $config->send($severity, $template_name, $template_data, $fields); }; sub notify { - my ($severity, $title, $message, $template_data, $fields, $config) = @_; + my ($severity, $template_name, $template_data, $fields, $config) = @_; $send_notification->( $severity, - $title, - $message, + $template_name, $template_data, $fields, $config @@ -76,11 +75,10 @@ sub notify { } sub info { - my ($title, $message, $template_data, $fields, $config) = @_; + my ($template_name, $template_data, $fields, $config) = @_; $send_notification->( 'info', - $title, - $message, + $template_name, $template_data, $fields, $config @@ -88,11 +86,10 @@ sub info { } sub notice { - my ($title, $message, $template_data, $fields, $config) = @_; + my ($template_name, $template_data, $fields, $config) = @_; $send_notification->( 'notice', - $title, - $message, + $template_name, $template_data, $fields, $config @@ -100,11 +97,10 @@ sub notice { } sub warning { - my ($title, $message, $template_data, $fields, $config) = @_; + my ($template_name, $template_data, $fields, $config) = @_; $send_notification->( 'warning', - $title, - $message, + $template_name, $template_data, $fields, $config @@ -112,11 +108,10 @@ sub warning { } sub error { - my ($title, $message, $template_data, $fields, $config) = @_; + my ($template_name, $template_data, $fields, $config) = @_; $send_notification->( 'error', - $title, - $message, + $template_name, $template_data, $fields, $config -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel