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 33EAF8934 for ; Wed, 16 Nov 2022 11:31:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 170DA1DB5B for ; Wed, 16 Nov 2022 11:31:43 +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 11:31:42 +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 071D544BB8 for ; Wed, 16 Nov 2022 11:31:42 +0100 (CET) Date: Wed, 16 Nov 2022 11:31:34 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20221116083014.27457-1-f.ebner@proxmox.com> In-Reply-To: <20221116083014.27457-1-f.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1668594678.ah8d7ocmsz.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.139 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, proxmox.com] Subject: [pve-devel] applied-series: [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 10:31:43 -0000 thanks! On November 16, 2022 9:30 am, Fiona Ebner wrote: > Since all tasks succeeded, previously no mail was sent in that case. >=20 > 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=3Dalways. But can be considered > an improvement, because the user sees the error right away. >=20 > Signed-off-by: Fiona Ebner > --- > PVE/VZDump.pm | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) >=20 > 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 =3D time() - $starttime; > =20 > eval { > + # otherwise $self->sendmail() will interpret it as multiple problems > + my $chomped_err =3D $err; > + chomp($chomped_err) if $chomped_err; > + > $self->sendmail( > $tasklist, > $totaltime, > - undef, > + $chomped_err, > $self->{job_init_log} . $job_start_log, > $job_end_log, > ); > --=20 > 2.30.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20