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 1D3596986E for ; Wed, 24 Feb 2021 19:32:00 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 041DE2CF44 for ; Wed, 24 Feb 2021 19:31:30 +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 1A8F72CEE9 for ; Wed, 24 Feb 2021 19:31:27 +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 C65E94631E for ; Wed, 24 Feb 2021 19:31:26 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 24 Feb 2021 19:31:01 +0100 Message-Id: <20210224183109.29014-5-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210224183109.29014-1-s.ivanov@proxmox.com> References: <20210224183109.29014-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.311 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [backup.pm] 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: [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: Wed, 24 Feb 2021 18:32:00 -0000 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"; + + 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; }; -- 2.20.1