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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8C4A28779 for ; Wed, 16 Nov 2022 09:30:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 777D11BCBE for ; Wed, 16 Nov 2022 09:30:24 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 16 Nov 2022 09:30:23 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 81C6044844 for ; Wed, 16 Nov 2022 09:30:17 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 16 Nov 2022 09:30:13 +0100 Message-Id: <20221116083014.27457-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.028 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF =?UTF-8?Q?record=0A=09?=URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [vzdump.pm] Subject: [pve-devel] [PATCH manager 1/2] fix #4351: vzdump: send mail if job-end hook fails with mailnotification=failure 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: Wed, 16 Nov 2022 08:30:24 -0000 Since all tasks succeeded, previously no mail was sent in that case. Note that the error passed to $self->sendmail() is added to the subject of the mail if it is a single line or the beginning of the mail otherwise. Thus changing the mail slightly compared to previously for the case where the job-start hook fails and the case where the job-end hook fails with mailnotification=always. But can be considered an improvement, because the user sees the error right away. Signed-off-by: Fiona Ebner --- PVE/VZDump.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index d5b3c500..9ef3c7b4 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -1305,10 +1305,14 @@ sub exec_backup { my $totaltime = time() - $starttime; eval { + # otherwise $self->sendmail() will interpret it as multiple problems + my $chomped_err = $err; + chomp($chomped_err) if $chomped_err; + $self->sendmail( $tasklist, $totaltime, - undef, + $chomped_err, $self->{job_init_log} . $job_start_log, $job_end_log, ); -- 2.30.2