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

chore(xen-api): set empty sessionId to undefined instead of null

Browse Source
This commit is contained in:
Julien Fontanet 2019-03-28 18:28:51 +01:00
parent 5d6b37f81a
commit e1e97ef158
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,7 @@ export class Xapi extends EventEmitter {
this._pool = null this._pool = null
this._readOnly = Boolean(opts.readOnly) this._readOnly = Boolean(opts.readOnly)
this._RecordsByType = { __proto__: null } this._RecordsByType = { __proto__: null }
this._sessionId = null this._sessionId = undefined
this._auth = opts.auth this._auth = opts.auth
const url = parseUrl(opts.url) const url = parseUrl(opts.url)
@ -190,7 +190,7 @@ export class Xapi extends EventEmitter {
get sessionId() { get sessionId() {
const id = this._sessionId const id = this._sessionId
if (!id || id === CONNECTING) { if (id === undefined || id === CONNECTING) {
throw new Error('sessionId is only available when connected') throw new Error('sessionId is only available when connected')
} }
@ -200,7 +200,11 @@ export class Xapi extends EventEmitter {
get status() { get status() {
const id = this._sessionId const id = this._sessionId
return id ? (id === CONNECTING ? CONNECTING : CONNECTED) : DISCONNECTED return id === undefined
? DISCONNECTED
: id === CONNECTING
? CONNECTING
: CONNECTED
} }
connect = coalesceCalls(this.connect) connect = coalesceCalls(this.connect)
@ -259,7 +263,7 @@ export class Xapi extends EventEmitter {
ignoreErrors.call(this._transportCall('session.logout', [this._sessionId])) ignoreErrors.call(this._transportCall('session.logout', [this._sessionId]))
this._sessionId = null this._sessionId = undefined
debug('%s: disconnected', this._humanId) debug('%s: disconnected', this._humanId)
@ -710,7 +714,7 @@ export class Xapi extends EventEmitter {
// Try to login again. // Try to login again.
debug('%s: the session has been reinitialized', this._humanId) debug('%s: the session has been reinitialized', this._humanId)
this._sessionId = null this._sessionId = undefined
return this.connect().then(() => this._sessionCall(method, args)) return this.connect().then(() => this._sessionCall(method, args))
} }
), ),