NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(xo-server-backup-reports): handle interrupted root task (#4772)

Browse Source
This commit is contained in:
badrAZ 2020-03-02 11:08:53 +01:00 committed by GitHub
parent 32960332b9
commit 6828a5d9a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.unreleased.md
View File

@ -11,6 +11,8 @@
> Users must be able to say: “I had this issue, happy to know it's fixed” > Users must be able to say: “I had this issue, happy to know it's fixed”
- [Backup reports] Fix backup report not sent in case of interrupted backup job (PR [#4772](https://github.com/vatesfr/xen-orchestra/pull/4772))
### Released packages ### Released packages
> Packages will be released in the order they are here, therefore, they should > Packages will be released in the order they are here, therefore, they should
@ -18,5 +20,6 @@
> >
> Rule of thumb: add packages on top. > Rule of thumb: add packages on top.
- xo-server-backup-reports v0.16.5
- xo-server v5.58.0 - xo-server v5.58.0
- xo-web v5.58.0 - xo-web v5.58.0

8
packages/xo-server-backup-reports/src/index.js
View File

@ -395,7 +395,13 @@ class BackupReportsXoPlugin {
mailReceivers, mailReceivers,
markdown: toMarkdown(markdown), markdown: toMarkdown(markdown),
success: false, success: false,
nagiosMarkdown: `[Xen Orchestra] [${log.status}] Backup report for ${jobName} - Error : ${log.result.message}`, nagiosMarkdown: `[Xen Orchestra] [${
log.status
}] Backup report for ${jobName}${
log.result?.message !== undefined
? ` - Error : ${log.result.message}`
: ''
}`,
}) })
} }