ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5262 from FinnStutzenstein/catchErrorOnInvalidCache

Browse Source 
Catch error on invalid cache data
This commit is contained in:
Emanuel Schütze 2020-03-20 13:24:53 +01:00 committed by GitHub
commit 4acadd33ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/src/app/core/core-services/data-store.service.ts
View File

@ -247,7 +247,15 @@ export class DataStoreUpdateManagerService {
slot.DS.triggerModifiedObservable(); slot.DS.triggerModifiedObservable();
// serve next slot request this.serveNextSlot();
}
public dropUpdateSlot(): void {
this.currentUpdateSlot = null;
this.serveNextSlot();
}
private serveNextSlot(): void {
if (this.updateSlotRequests.length > 0) { if (this.updateSlotRequests.length > 0) {
const request = this.updateSlotRequests.pop(); const request = this.updateSlotRequests.pop();
request.resolve(); request.resolve();
@ -347,14 +355,21 @@ export class DataStoreService {
/** /**
* Gets the DataStore from cache and instantiate all models out of the serialized version. * Gets the DataStore from cache and instantiate all models out of the serialized version.
* If something fails, the DS is cleared, so fresh data can be requrested from the server.
*
* @returns The max change id. * @returns The max change id.
*/ */
public async initFromStorage(): Promise<number> { public async initFromStorage(): Promise<number> {
// This promise will be resolved with cached datastore. // This promise will be resolved with cached datastore.
const store = await this.storageService.get<JsonStorage>(DataStoreService.cachePrefix + 'DS'); const store = await this.storageService.get<JsonStorage>(DataStoreService.cachePrefix + 'DS');
if (store) { if (!store) {
const updateSlot = await this.DSUpdateManager.getNewUpdateSlot(this); await this.clear();
return this.maxChangeId;
}
const updateSlot = await this.DSUpdateManager.getNewUpdateSlot(this);
try {
// There is a store. Deserialize it // There is a store. Deserialize it
this.jsonStore = store; this.jsonStore = store;
this.modelStore = this.deserializeJsonStore(this.jsonStore); this.modelStore = this.deserializeJsonStore(this.jsonStore);
@ -374,7 +389,8 @@ export class DataStoreService {
}); });
this.DSUpdateManager.commit(updateSlot, maxChangeId, true); this.DSUpdateManager.commit(updateSlot, maxChangeId, true);
} else { } catch (e) {
this.DSUpdateManager.dropUpdateSlot();
await this.clear(); await this.clear();
} }
return this.maxChangeId; return this.maxChangeId;