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

chore(xo-server/backup executor): proxyId = job.proxy

Browse Source
This commit is contained in:
Julien Fontanet 2020-08-26 16:50:33 +02:00
parent 08eef80673
commit b4e068f630
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/xo-server/src/xo-mixins/backups-ng/index.js
View File

@ -591,7 +591,8 @@ export default class BackupNg {
const remoteIds = unboxIdsFromPattern(job.remotes) const remoteIds = unboxIdsFromPattern(job.remotes)
const srIds = unboxIdsFromPattern(job.srs) const srIds = unboxIdsFromPattern(job.srs)
if (job.proxy !== undefined) { const proxyId = job.proxy
if (proxyId !== undefined) {
const vmIds = Object.keys(vms) const vmIds = Object.keys(vms)
const recordToXapi = {} const recordToXapi = {}
@ -609,9 +610,9 @@ export default class BackupNg {
await waitAll([ await waitAll([
asyncMap(remoteIds, async id => { asyncMap(remoteIds, async id => {
const remote = await app.getRemoteWithCredentials(id) const remote = await app.getRemoteWithCredentials(id)
if (remote.proxy !== job.proxy) { if (remote.proxy !== proxyId) {
throw new Error( throw new Error(
`The remote ${remote.name} must be linked to the proxy ${job.proxy}` `The remote ${remote.name} must be linked to the proxy ${proxyId}`
) )
} }
@ -652,7 +653,7 @@ export default class BackupNg {
try { try {
const logsStream = await app.callProxyMethod( const logsStream = await app.callProxyMethod(
job.proxy, proxyId,
'backup.run', 'backup.run',
params, params,
{ {
@ -700,7 +701,7 @@ export default class BackupNg {
// XO API invalid parameters error // XO API invalid parameters error
if (error.code === 10) { if (error.code === 10) {
delete params.streamLogs delete params.streamLogs
return app.callProxyMethod(job.proxy, 'backup.run', params) return app.callProxyMethod(proxyId, 'backup.run', params)
} }
throw error throw error
} }