From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api v2 3/3] backup: add notify parameter to 'classic' backup
Date: Mon, 1 Mar 2021 15:12:20 +0100 [thread overview]
Message-ID: <20210301141225.18394-4-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20210301141225.18394-1-s.ivanov@proxmox.com>
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 <s.ivanov@proxmox.com>
---
src/PMG/API2/Backup.pm | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/PMG/API2/Backup.pm b/src/PMG/API2/Backup.pm
index 4ea28d1..2248fa5 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 => 'never',
+ },
},
},
returns => { type => "string" },
@@ -129,11 +136,21 @@ __PACKAGE__->register_method ({
my $worker = sub {
my $upid = shift;
- print "starting backup to: $filename\n";
+ my $full_log = "";
+ my $log = sub { print "$_[0]\n"; $full_log .= "$_[0]\n"; };
+
+ $log->("starting backup to: $filename\n");
+
+ eval { PMG::Backup::pmg_backup_pack($filename, $param->{statistic}) };
+ if (my $err = $@) {
+ $log->($err);
+ PMG::Backup::send_backup_notification($param->{notify}, undef, $full_log, $err);
+ die "backup failed: $err\n";
+ }
- PMG::Backup::pmg_backup_pack($filename, $param->{statistic});
+ $log->("backup finished\n");
- print "backup finished\n";
+ PMG::Backup::send_backup_notification($param->{notify}, undef, $full_log, undef);
return;
};
--
2.20.1
next prev parent reply other threads:[~2021-03-01 14:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 14:12 [pmg-devel] [PATCH pmg-api/gui/docs v2] small improvments for PBS integration Stoiko Ivanov
2021-03-01 14:12 ` [pmg-devel] [PATCH pmg-api v2 1/3] backup: pbs: prevent race in concurrent backups Stoiko Ivanov
2021-03-05 21:42 ` [pmg-devel] applied: " Thomas Lamprecht
2021-03-01 14:12 ` [pmg-devel] [PATCH pmg-api v2 2/3] backup: fix #3146 add email notifications Stoiko Ivanov
2021-03-05 21:43 ` [pmg-devel] applied: " Thomas Lamprecht
2021-03-01 14:12 ` Stoiko Ivanov [this message]
2021-03-05 21:43 ` [pmg-devel] applied: [PATCH pmg-api v2 3/3] backup: add notify parameter to 'classic' backup Thomas Lamprecht
2021-03-01 14:12 ` [pmg-devel] [PATCH pmg-gui v2 1/4] backup: pbs: add onlineHelp anchors Stoiko Ivanov
2021-03-01 14:12 ` [pmg-devel] [PATCH pmg-gui v2 2/4] backup: fix #3154: make statistic backup optional Stoiko Ivanov
2021-03-01 14:12 ` [pmg-devel] [PATCH pmg-gui v2 3/4] backup: pbs: fix #3154: add statistic setting to remote Stoiko Ivanov
2021-03-01 14:12 ` [pmg-devel] [PATCH pmg-gui v2 4/4] backup: pbs: fix #3146 add notify " Stoiko Ivanov
2021-03-01 14:12 ` [pmg-devel] [PATCH pmg-docs v2 1/1] backup: shortly document #3146 and #3154 Stoiko Ivanov
2021-03-05 21:45 ` [pmg-devel] applied: " Thomas Lamprecht
2021-03-05 22:07 ` [pmg-devel] applied: [PATCH pmg-api/gui/docs v2] small improvments for PBS integration Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210301141225.18394-4-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox