Don't fail to start up if lazy load check fails #759
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Do the lazy loading check in the batch of things we do before starting a sync rather than at client start time, so we don't fail to start the client if we can't hit the HS to determine LL support. Fixes element-hq/element-web#7455
dbkr
added a commit
to matrix-org/matrix-react-sdk
that referenced
this pull request
Oct 10, 2018
js-sdk now emits sync state ERROR with an InvalidStoreError if the store needs to be cleared before it can be used. Requires matrix-org/matrix-js-sdk#759
bwindels
approved these changes
Oct 10, 2018
src/sync.js
Outdated
| // if we don't know any better | ||
| let lazyLoadMembersBefore = false; | ||
| const isStoreNewlyCreated = await this.client.store.isNewlyCreated(); | ||
| console.log("store newly created? "+isStoreNewlyCreated); |
src/sync.js
Outdated
| if (prevClientOptions) { | ||
| lazyLoadMembersBefore = !!prevClientOptions.lazyLoadMembers; | ||
| } | ||
| console.log("prev ll: "+lazyLoadMembersBefore); |
There was a problem hiding this comment.
same here, guess this is a leftover?
src/sync.js
Outdated
| } | ||
| // need to vape the store when enabling LL and wasn't enabled before | ||
| const shouldClear = await this._wasLazyLoadingToggled(this.opts.lazyLoadMembers); | ||
| console.log("was toggled? "+shouldClear); |
src/sync.js
Outdated
| } | ||
| if (this.opts.lazyLoadMembers) { | ||
| const supported = await client.doesServerSupportLazyLoading(); | ||
| console.log("server supports ll? "+supported); |
src/errors.js
Outdated
| @@ -2,7 +2,7 @@ | |||
| // because of http://babeljs.io/docs/usage/caveats/#classes | |||
| function InvalidStoreError(reason, value) { | |||
| const message = `Store is invalid because ${reason}, ` + | |||
| `please delete all data and retry`; | |||
| `please stopthe client, delete all data and start the client again`; | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Do the lazy loading check in the batch of things we do before
starting a sync rather than at client start time, so we don't fail
to start the client if we can't hit the HS to determine LL support.
Fixes element-hq/element-web#7455