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 EECBE69CF0 for ; Thu, 25 Feb 2021 11:07:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E02DB32B41 for ; Thu, 25 Feb 2021 11:06:32 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 6E7F632B34 for ; Thu, 25 Feb 2021 11:06:32 +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 3639846312 for ; Thu, 25 Feb 2021 11:06:32 +0100 (CET) Message-ID: Date: Thu, 25 Feb 2021 11:06:31 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:86.0) Gecko/20100101 Thunderbird/86.0 Content-Language: en-US To: Stoiko Ivanov , pmg-devel@lists.proxmox.com References: <20210224183109.29014-1-s.ivanov@proxmox.com> <20210224183109.29014-5-s.ivanov@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20210224183109.29014-5-s.ivanov@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.427 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_SBL 0.644 Contains an URL's NS IP listed in the Spamhaus SBL blocklist [backup.pm] URIBL_SBL_A 0.1 Contains URL's A record listed in the Spamhaus SBL blocklist [backup.pm] Subject: Re: [pmg-devel] [PATCH pmg-api 4/5] backup: add notify parameter to 'classic' backup X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2021 10:07:03 -0000 On 24.02.21 19:31, Stoiko Ivanov wrote: > for feature-parity, and since we recently had a user in our community > forum, who does regular backups via cron+rsync (small site w/o > dedicated backup host). Those setups could also benefit from this. > > Signed-off-by: Stoiko Ivanov > --- > src/PMG/API2/Backup.pm | 21 ++++++++++++++++++--- > 1 file changed, 18 insertions(+), 3 deletions(-) > > diff --git a/src/PMG/API2/Backup.pm b/src/PMG/API2/Backup.pm > index 4ea28d1..5887bb2 100644 > --- a/src/PMG/API2/Backup.pm > +++ b/src/PMG/API2/Backup.pm > @@ -110,6 +110,13 @@ __PACKAGE__->register_method ({ > optional => 1, > default => 1, > }, > + notify => { > + description => "Specify when to notify via e-mail", > + type => 'string', > + enum => [ 'always', 'error', 'never' ], > + optional => 1, > + default => 'error', > + }, > }, > }, > returns => { type => "string" }, > @@ -129,11 +136,19 @@ __PACKAGE__->register_method ({ > my $worker = sub { > my $upid = shift; > > - print "starting backup to: $filename\n"; > + my $log = "starting backup to: $filename\n"; same regarding please avoiding $log at the end and no log in error case... Just combine print and log string concat into a closure... > + > + eval { PMG::Backup::pmg_backup_pack($filename, $param->{statistic}) }; > + my $err = $@; > + $log .= $err if $err; > + > + $log .= "backup finished\n"; > + > + PMG::Backup::send_backup_notification($param->{notify}, undef, $log, $err); > > - PMG::Backup::pmg_backup_pack($filename, $param->{statistic}); > + die "$err\n" if $err; > > - print "backup finished\n"; > + print $log; > > return; > }; >