From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api 4/5] backup: add notify parameter to 'classic' backup
Date: Wed, 24 Feb 2021 19:31:01 +0100 [thread overview]
Message-ID: <20210224183109.29014-5-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20210224183109.29014-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 | 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
next prev parent reply other threads:[~2021-02-24 18:32 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-24 18:30 [pmg-devel] [PATCH pmg-api/gui/docs] small improvments for PBS integration Stoiko Ivanov
2021-02-24 18:30 ` [pmg-devel] [PATCH pmg-api 1/5] backup: fix die invocation Stoiko Ivanov
2021-02-25 9:40 ` [pmg-devel] applied: " Thomas Lamprecht
2021-02-24 18:30 ` [pmg-devel] [PATCH pmg-api 2/5] backup: fix #3154 add 'include-statistics' to pbs Stoiko Ivanov
2021-02-25 9:40 ` [pmg-devel] applied: " Thomas Lamprecht
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-api 3/5] backup: fix #3146 add email notifications Stoiko Ivanov
2021-02-25 10:04 ` Thomas Lamprecht
2021-02-24 18:31 ` Stoiko Ivanov [this message]
2021-02-25 10:06 ` [pmg-devel] [PATCH pmg-api 4/5] backup: add notify parameter to 'classic' backup Thomas Lamprecht
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-api 5/5] backup: pbs: prevent race in concurrent backups Stoiko Ivanov
2021-02-25 10:14 ` Thomas Lamprecht
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-gui 1/4] backup: pbs: add onlineHelp anchors Stoiko Ivanov
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-gui 2/4] backup: fix #3154: make statistic backup optional Stoiko Ivanov
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-gui 3/4] backup: pbs: fix #3154: add statistic setting to remote Stoiko Ivanov
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-gui 4/4] backup: pbs: fix #3146 add notify " Stoiko Ivanov
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-docs 1/3] backup: fix typos Stoiko Ivanov
2021-02-25 10:15 ` [pmg-devel] applied: " Thomas Lamprecht
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-docs 2/3] backup: add anchors to pbs sections Stoiko Ivanov
2021-02-25 10:15 ` [pmg-devel] applied: " Thomas Lamprecht
2021-02-24 18:31 ` [pmg-devel] [PATCH pmg-docs 3/3] backup: shortly document #3146 and #3154 Stoiko Ivanov
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=20210224183109.29014-5-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