Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-17 23:44:39 -05:00
Code Issues Activity

Fixed TaskCancelation errors

Browse source 
sentry issue: ADMIN-AY5

- added guards for cancelation errors where we're casting tasks to promises
- see http://ember-concurrency.com/docs/task-cancelation-help for full details
This commit is contained in:
Kevin Ansfield 2022-11-23 10:42:31 +00:00
parent 8d9d22e5a7
commit d15f740a3f
5 changed files with 50 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ghost/admin/app/components/posts/analytics.js
View file

@ -1,7 +1,7 @@
import Component from '@glimmer/component'; import Component from '@glimmer/component';
import {action} from '@ember/object'; import {action} from '@ember/object';
import {didCancel, task} from 'ember-concurrency';
import {inject as service} from '@ember/service'; import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking'; import {tracked} from '@glimmer/tracking';
/** /**
@ -187,10 +187,17 @@ export default class Analytics extends Component {
} }
async fetchReferrersStats() { async fetchReferrersStats() {
if (this._fetchReferrersStats.isRunning) { try {
return this._fetchReferrersStats.last; if (this._fetchReferrersStats.isRunning) {
return this._fetchReferrersStats.last;
}
return this._fetchReferrersStats.perform();
} catch (e) {
if (!didCancel(e)) {
// re-throw the non-cancelation error
throw e;
}
} }
return this._fetchReferrersStats.perform();
} }
async fetchLinks() { async fetchLinks() {

15
ghost/admin/app/components/posts/old-analytics.js
View file

@ -1,7 +1,7 @@
import Component from '@glimmer/component'; import Component from '@glimmer/component';
import {action} from '@ember/object'; import {action} from '@ember/object';
import {didCancel, task} from 'ember-concurrency';
import {inject as service} from '@ember/service'; import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking'; import {tracked} from '@glimmer/tracking';
/** /**
@ -165,10 +165,17 @@ export default class Analytics extends Component {
} }
async fetchReferrersStats() { async fetchReferrersStats() {
if (this._fetchReferrersStats.isRunning) { try {
return this._fetchReferrersStats.last; if (this._fetchReferrersStats.isRunning) {
return this._fetchReferrersStats.last;
}
return this._fetchReferrersStats.perform();
} catch (e) {
if (!didCancel(e)) {
// re-throw the non-cancelation error
throw e;
}
} }
return this._fetchReferrersStats.perform();
} }
async fetchLinks() { async fetchLinks() {

11
ghost/admin/app/helpers/activity-feed-fetcher.js
View file

@ -2,8 +2,8 @@ import moment from 'moment-timezone';
import {Resource} from 'ember-could-get-used-to-this'; import {Resource} from 'ember-could-get-used-to-this';
import {TrackedArray} from 'tracked-built-ins'; import {TrackedArray} from 'tracked-built-ins';
import {action} from '@ember/object'; import {action} from '@ember/object';
import {didCancel, task} from 'ember-concurrency';
import {inject as service} from '@ember/service'; import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking'; import {tracked} from '@glimmer/tracking';
const actions = { const actions = {
@ -59,7 +59,14 @@ export default class ActivityFeedFetcher extends Resource {
filter += `+${this.args.named.filter}`; filter += `+${this.args.named.filter}`;
} }
await this.loadEventsTask.perform({filter}, actions.showNext); try {
await this.loadEventsTask.perform({filter}, actions.showNext);
} catch (e) {
if (!didCancel(e)) {
// re-throw the non-cancelation error
throw e;
}
}
} }
@action @action

12
ghost/admin/app/helpers/history-event-fetcher.js
View file

@ -2,8 +2,8 @@ import moment from 'moment-timezone';
import {Resource} from 'ember-could-get-used-to-this'; import {Resource} from 'ember-could-get-used-to-this';
import {TrackedArray} from 'tracked-built-ins'; import {TrackedArray} from 'tracked-built-ins';
import {action} from '@ember/object'; import {action} from '@ember/object';
import {didCancel, task} from 'ember-concurrency';
import {inject as service} from '@ember/service'; import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking'; import {tracked} from '@glimmer/tracking';
export default class HistoryEventFetcher extends Resource { export default class HistoryEventFetcher extends Resource {
@ -38,8 +38,14 @@ export default class HistoryEventFetcher extends Resource {
filter += `+${this.args.named.filter}`; filter += `+${this.args.named.filter}`;
} }
// Can't get this working with Promise.all, somehow results in an infinite loop try {
await this.loadEventsTask.perform({filter}); await this.loadEventsTask.perform({filter});
} catch (e) {
if (!didCancel(e)) {
// re-throw the non-cancelation error
throw e;
}
}
} }
@action @action

13
ghost/admin/app/helpers/members-event-fetcher.js
View file

@ -2,8 +2,8 @@ import moment from 'moment-timezone';
import {Resource} from 'ember-could-get-used-to-this'; import {Resource} from 'ember-could-get-used-to-this';
import {TrackedArray} from 'tracked-built-ins'; import {TrackedArray} from 'tracked-built-ins';
import {action} from '@ember/object'; import {action} from '@ember/object';
import {didCancel, task} from 'ember-concurrency';
import {inject as service} from '@ember/service'; import {inject as service} from '@ember/service';
import {task} from 'ember-concurrency';
import {tracked} from '@glimmer/tracking'; import {tracked} from '@glimmer/tracking';
export default class MembersEventsFetcher extends Resource { export default class MembersEventsFetcher extends Resource {
@ -46,8 +46,15 @@ export default class MembersEventsFetcher extends Resource {
} }
// Can't get this working with Promise.all, somehow results in an infinite loop // Can't get this working with Promise.all, somehow results in an infinite loop
await this.loadEventsTask.perform({filter}); try {
await this.loadMultipleNewslettersTask.perform(); await this.loadEventsTask.perform({filter});
await this.loadMultipleNewslettersTask.perform();
} catch (e) {
if (!didCancel(e)) {
// re-throw the non-cancelation error
throw e;
}
}
} }
@action @action