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

chore(xo-server): replace eventToPromise with fromEvent

Browse Source
This commit is contained in:
Julien Fontanet 2018-03-06 14:17:43 +01:00
parent b7d3762c06
commit 3e89c62e72
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/xo-server/src/remote-handlers/abstract.js
View File

@ -1,6 +1,5 @@
import eventToPromise from 'event-to-promise'
import through2 from 'through2' import through2 from 'through2'
import { ignoreErrors } from 'promise-toolbox' import { fromEvent, ignoreErrors } from 'promise-toolbox'
import { parse } from 'xo-remote-parser' import { parse } from 'xo-remote-parser'
import { getPseudoRandomBytes, streamToBuffer } from '../utils' import { getPseudoRandomBytes, streamToBuffer } from '../utils'
@ -78,7 +77,7 @@ export default class RemoteHandlerAbstract {
async _outputFile (file, data, options) { async _outputFile (file, data, options) {
const stream = await this.createOutputStream(file, options) const stream = await this.createOutputStream(file, options)
const promise = eventToPromise(stream, 'finish') const promise = fromEvent(stream, 'finish')
stream.end(data) stream.end(data)
return promise return promise
} }
@ -121,7 +120,7 @@ export default class RemoteHandlerAbstract {
const path = typeof file === 'string' ? file : file.path const path = typeof file === 'string' ? file : file.path
const streamP = this._createReadStream(file, options).then(stream => { const streamP = this._createReadStream(file, options).then(stream => {
// detect early errors // detect early errors
let promise = eventToPromise(stream, 'readable') let promise = fromEvent(stream, 'readable')
// try to add the length prop if missing and not a range stream // try to add the length prop if missing and not a range stream
if ( if (

4
packages/xo-server/src/vhd-merge.js
View File

@ -2,9 +2,9 @@
import assert from 'assert' import assert from 'assert'
import concurrency from 'limit-concurrency-decorator' import concurrency from 'limit-concurrency-decorator'
import eventToPromise from 'event-to-promise'
import fu from '@nraynaud/struct-fu' import fu from '@nraynaud/struct-fu'
import isEqual from 'lodash/isEqual' import isEqual from 'lodash/isEqual'
import { fromEvent } from 'promise-toolbox'
import constantStream from './constant-stream' import constantStream from './constant-stream'
import { noop, streamToBuffer } from './utils' import { noop, streamToBuffer } from './utils'
@ -405,7 +405,7 @@ export class Vhd {
stream.on('error', reject) stream.on('error', reject)
stream.end(data, resolve) stream.end(data, resolve)
}) })
: eventToPromise(data.pipe(stream), 'finish') : fromEvent(data.pipe(stream), 'finish')
} }
async ensureBatSize (size) { async ensureBatSize (size) {

12
packages/xo-server/src/xo-mixins/backups.js
View File

@ -1,9 +1,8 @@
import deferrable from 'golike-defer' import deferrable from 'golike-defer'
import escapeStringRegexp from 'escape-string-regexp' import escapeStringRegexp from 'escape-string-regexp'
import eventToPromise from 'event-to-promise'
import execa from 'execa' import execa from 'execa'
import splitLines from 'split-lines' import splitLines from 'split-lines'
import { CancelToken, ignoreErrors } from 'promise-toolbox' import { CancelToken, fromEvent, ignoreErrors } from 'promise-toolbox'
import { createParser as createPairsParser } from 'parse-pairs' import { createParser as createPairsParser } from 'parse-pairs'
import { createReadStream, readdir, stat } from 'fs' import { createReadStream, readdir, stat } from 'fs'
import { satisfies as versionSatisfies } from 'semver' import { satisfies as versionSatisfies } from 'semver'
@ -123,7 +122,7 @@ async function checkFileIntegrity (handler, name) {
// } // }
// //
// stream.resume() // stream.resume()
// await eventToPromise(stream, 'finish') // await fromEvent(stream, 'finish')
} }
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -678,7 +677,7 @@ export default class {
stream.on('error', error => targetStream.emit('error', error)) stream.on('error', error => targetStream.emit('error', error))
await Promise.all([ await Promise.all([
eventToPromise(stream.pipe(sizeStream).pipe(targetStream), 'finish'), fromEvent(stream.pipe(sizeStream).pipe(targetStream), 'finish'),
stream.task, stream.task,
]) ])
} catch (error) { } catch (error) {
@ -935,10 +934,7 @@ export default class {
sourceStream.pipe(sizeStream).pipe(targetStream) sourceStream.pipe(sizeStream).pipe(targetStream)
await Promise.all([ await Promise.all([sourceStream.task, fromEvent(targetStream, 'finish')])
sourceStream.task,
eventToPromise(targetStream, 'finish'),
])
return { return {
transferSize: sizeStream.size, transferSize: sizeStream.size,