From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4208991BEF for ; Mon, 27 Mar 2023 17:19:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C11B4D3FB for ; Mon, 27 Mar 2023 17:19:24 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 27 Mar 2023 17:19:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id EC47047001 for ; Mon, 27 Mar 2023 17:19:22 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Mon, 27 Mar 2023 17:18:55 +0200 Message-Id: <20230327151857.495565-17-l.wagner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230327151857.495565-1-l.wagner@proxmox.com> References: <20230327151857.495565-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.176 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 pve-manager 16/18] api: replication: send notifications via new notification module 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: , X-List-Received-Date: Mon, 27 Mar 2023 15:19:52 -0000 Signed-off-by: Lukas Wagner --- PVE/API2/Replication.pm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Replication.pm b/PVE/API2/Replication.pm index d70b4607..e3566a71 100644 --- a/PVE/API2/Replication.pm +++ b/PVE/API2/Replication.pm @@ -15,6 +15,7 @@ use PVE::QemuConfig; use PVE::QemuServer; use PVE::LXC::Config; use PVE::LXC; +use PVE::Notification; use PVE::RESTHandler; @@ -129,7 +130,17 @@ my sub _handle_job_err { $msg .= "\nError:\n$err"; eval { - PVE::Tools::sendmail('root', "Replication Job: $job->{id} failed", $msg) + my $config = PVE::Notification::config(); + # For backward compatibility, add ephemeral sendmail endpoint, + # so that root receives a notification even + # if there is no endpoint defined. + $config->add_sendmail_endpoint( + "legacy-replication-sendmail", + ["root"], + undef, # TODO: read $mailfrom from datacenter.conf? + ""); + + PVE::Notification::error("Replication Job: $job->{id} failed", $msg, $config); }; warn ": $@" if $@; } -- 2.30.2