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

chore: simplify _watchEvents() and _watchEventsLegacy() implementation

Browse Source 
I finally understood ES6 Temporal Dead Zone!
This commit is contained in:
Julien Fontanet
2016-05-11 11:53:39 +02:00
parent 6e0956f09f
commit cd65bc7683
1 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
packages/xen-api/src/index.js
View File

@@ -612,33 +612,31 @@ export class Xapi extends EventEmitter {
}
_watchEvents () {
const loop = invoke(() => {
const onSuccess = ({token, events}) => {
this._fromToken = token
this._processEvents(events)
const loop = () => this._sessionCall('event.from', [
['*'],
this._fromToken,
1e3 + 0.1 // Force float.
]).then(onSuccess, onFailure)
const debounce = this._debounce
return debounce != null
? Bluebird.delay(debounce).then(loop)
: loop()
}
const onFailure = error => {
if (areEventsLost(error)) {
this._fromToken = ''
this._objects.clear()
const onSuccess = ({token, events}) => {
this._fromToken = token
this._processEvents(events)
return loop()
}
const debounce = this._debounce
return debounce != null
? Bluebird.delay(debounce).then(loop)
: loop()
}
const onFailure = error => {
if (areEventsLost(error)) {
this._fromToken = ''
this._objects.clear()
throw error
return loop()
}
return () => this._sessionCall('event.from', [
['*'],
this._fromToken,
1e3 + 0.1 // Force float.
]).then(onSuccess, onFailure)
})
throw error
}
return loop().catch(error => {
if (
@@ -691,30 +689,26 @@ export class Xapi extends EventEmitter {
})
}
const watchEvents = invoke(() => {
const loop = invoke(() => {
const onSuccess = events => {
this._processEvents(events)
const watchEvents = () => this._sessionCall('event.register', [ ['*'] ]).then(loop)
const debounce = this._debounce
return debounce == null
? loop()
: Bluebird.delay(debounce).then(loop)
}
const loop = () => this._sessionCall('event.next', []).then(onSuccess, onFailure)
const onFailure = error => {
if (areEventsLost(error)) {
return this._sessionCall('event.unregister', [ ['*'] ]).then(watchEvents)
}
const onSuccess = events => {
this._processEvents(events)
throw error
}
const debounce = this._debounce
return debounce == null
? loop()
: Bluebird.delay(debounce).then(loop)
}
return () => this._sessionCall('event.next', []).then(onSuccess, onFailure)
})
const onFailure = error => {
if (areEventsLost(error)) {
return this._sessionCall('event.unregister', [ ['*'] ]).then(watchEvents)
}
return () => this._sessionCall('event.register', [ ['*'] ]).then(loop)
})
throw error
}
return getAllObjects().then(watchEvents)
}