IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Annotations: Ignore cancelled annotation queries (#26681)

Browse Source
This commit is contained in:
Torkel Ödegaard 2020-07-30 10:23:39 +02:00 committed by GitHub
parent eb0b9de044
commit 3f21283655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/annotations/annotations_srv.ts
View File

@ -59,9 +59,14 @@ export class AnnotationsSrv {
}; };
}) })
.catch(err => { .catch(err => {
if (err.cancelled) {
return [];
}
if (!err.message && err.data && err.data.message) { if (!err.message && err.data && err.data.message) {
err.message = err.data.message; err.message = err.data.message;
} }
console.error('AnnotationSrv.query error', err); console.error('AnnotationSrv.query error', err);
appEvents.emit(AppEvents.alertError, ['Annotation Query Failed', err.message || err]); appEvents.emit(AppEvents.alertError, ['Annotation Query Failed', err.message || err]);
return []; return [];