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

Avoid crashes on failed VM exports.

Browse Source
This commit is contained in:
Julien Fontanet 2015-09-11 12:48:22 +02:00
parent 012e5c09ed
commit a2adbb19bd
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/vm.coffee
View File

@ -658,7 +658,9 @@ exports.revert = revert
#--------------------------------------------------------------------- #---------------------------------------------------------------------
handleExport = (req, res, {stream, response: upstream}) -> handleExport = (req, res, { stream }) ->
upstream = stream.response
res.writeHead( res.writeHead(
upstream.statusCode, upstream.statusCode,
upstream.statusMessage ? '', upstream.statusMessage ? '',
@ -675,10 +677,7 @@ export_ = $coroutine ({vm, compress, onlyMetadata}) ->
}) })
return { return {
$getFrom: yield @registerHttpRequest(handleExport, { $getFrom: yield @registerHttpRequest(handleExport, { stream })
stream,
response: yield stream.response
})
} }
export_.params = { export_.params = {

3
src/xapi.js
View File

@ -632,7 +632,8 @@ export default class Xapi extends XapiBase {
use_compression: compress ? 'true' : 'false' use_compression: compress ? 'true' : 'false'
} }
}) })
stream.response = eventToPromise(stream, 'response')
stream.response = await eventToPromise(stream, 'response')
return stream return stream
} }