Compare commits

...

24 Commits

Author SHA1 Message Date
15926cc9a2 Merge branch 'master' into yield-request-callback 2021-09-17 17:45:00 -07:00
d647e287fd Merge branch 'master' into yield-request-callback 2021-09-17 15:56:56 -07:00
7998ee3f61 Merge branch 'master' into yield-request-callback 2021-09-17 09:54:37 -07:00
e7d94d9447 Merge branch 'master' into yield-request-callback 2021-09-16 11:18:08 -07:00
336babdb15 moving requestAbort undefined assignment after try/catch block, since it happens eitherway 2021-09-16 11:17:19 -07:00
0b4624fc8f adding onPartialResponse back in, done testing without 2021-09-16 11:11:46 -07:00
62c54e732d suppressing abort error 2021-09-16 11:11:08 -07:00
e63393b0c4 looking to suppress errors related to aborting and testing reguarl requests (not yield) are still working with new updates to requests 2021-09-16 10:20:18 -07:00
02c97ae10b Merge branch 'yield-request-callback' of https://github.com/nasa/openmct into yield-request-callback
Merge'n master
2021-09-15 10:43:07 -07:00
5b499368ae updating key for processing method 2021-09-15 10:42:56 -07:00
dd556c3335 Merge branch 'master' into yield-request-callback 2021-09-14 17:34:20 -07:00
1a71708b63 Merge branch 'master' into yield-request-callback 2021-09-14 09:13:53 -07:00
ab425ed04e Merge branch 'master' into yield-request-callback 2021-09-09 12:30:36 -07:00
514181c2fd debuggin 2021-09-08 14:15:55 -07:00
757ff1c85a debuggin 2021-09-08 13:48:25 -07:00
e7f21654e0 was doin generators all wrong 2021-09-08 13:04:13 -07:00
c895869cbf wrapping generator function 2021-09-08 12:40:53 -07:00
5d40a55a20 debugging processGenerator 2021-09-08 12:19:17 -07:00
54477f2bb9 debugging processGenerator 2021-09-08 12:09:03 -07:00
eb894894b5 debugging processGenerator 2021-09-08 11:59:07 -07:00
3f06bc5c48 telemetry check 2021-09-08 11:29:30 -07:00
c3238e50ee fixing random module auto-complete inserted 2021-09-08 11:11:29 -07:00
d83e919541 fixing random module auto-complete inserted 2021-09-07 15:34:55 -07:00
5fcf0bd7de added processor generator to the request options 2021-09-07 11:19:12 -07:00

View File

@ -115,6 +115,7 @@ export class TelemetryCollection extends EventEmitter {
this._requestHistoricalTelemetry();
}
/**
* If a historical provider exists, then historical requests will be made
* @private
@ -126,20 +127,25 @@ export class TelemetryCollection extends EventEmitter {
let historicalData;
this.options.onPartialResponse = this._processNewTelemetry.bind(this);
try {
this.requestAbort = new AbortController();
this.options.signal = this.requestAbort.signal;
historicalData = await this.historicalProvider.request(this.domainObject, this.options);
this.requestAbort = undefined;
} catch (error) {
if (error.name !== 'AbortError') {
console.error('Error requesting telemetry data...');
this.requestAbort = undefined;
this._error(error);
}
}
this.requestAbort = undefined;
this._processNewTelemetry(historicalData);
}
/**
* This uses the built in subscription function from Telemetry API
* @private