Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop keep alive when sync is aborted #3686

Closed
wants to merge 5 commits into from
Closed

Stop keep alive when sync is aborted #3686

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1872a8b
stop keepAlive when the connection was aborted as done by calling sto…
Aug 29, 2023
a33edb2
Merge branch 'matrix-org:develop' into develop
finsterwalder Aug 29, 2023
58728e6
Merge branch 'matrix-org:develop' into develop
finsterwalder Aug 29, 2023
6122e93
Merge branch 'stop_keepAlive_when_sync_is_aborted' of github.com:fins…
Aug 30, 2023
18dab2f
check syncs this.running to abort a keep alive
Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/sync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,13 @@ export class SyncApi {
success();
},
(err) => {
if (err.httpStatus == 400 || err.httpStatus == 404) {
if (err.name === "AbortError") {
clearTimeout(this.keepAliveTimer);
if (this.connectionReturnedDefer) {
this.connectionReturnedDefer.reject();
this.connectionReturnedDefer = undefined;
}
} else if (err.httpStatus == 400 || err.httpStatus == 404) {
// treat this as a success because the server probably just doesn't
// support /versions: point is, we're getting a response.
// We wait a short time though, just in case somehow the server
Expand Down
Loading