From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-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 A3C631FF380
for <inbox@lore.proxmox.com>; Fri, 19 Apr 2024 11:29:42 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 8B3DB3F7E;
Fri, 19 Apr 2024 11:29:41 +0200 (CEST)
Message-ID: <642f27fd-a471-4160-8469-7dab759f9453@proxmox.com>
Date: Fri, 19 Apr 2024 11:29:07 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Lukas Wagner <l.wagner@proxmox.com>
References: <20240409132555.364926-1-l.wagner@proxmox.com>
<20240409132555.364926-16-l.wagner@proxmox.com>
Content-Language: en-US
From: Fiona Ebner <f.ebner@proxmox.com>
In-Reply-To: <20240409132555.364926-16-l.wagner@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.069 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: Re: [pve-devel] [PATCH cluster 15/19] 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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Am 09.04.24 um 15:25 schrieb Lukas Wagner:
> 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 <l.wagner@proxmox.com>
> Tested-by: Folke Gleumes <f.gleumes@proxmox.com>
> ---
> 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) = @_;
And there's another versioned breaks required for packages with the
callers of all these functions here. Old version of package with caller
will be broken with new pve-cluster.
> $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
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel