github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-05 18:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2686 from overleaf/jpa-fix-parallel-reconnect

Browse source 
[frontend] ConnectionManager: fix parallel reconnect

GitOrigin-RevId: 38619b30dc38fd2732b77c0a785c8ab2857c81ff
This commit is contained in:
Jakob Ackermann 2020-03-30 12:19:28 +02:00 committed by Copybot
parent 2ce244d662
commit 4d67acc7f5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/web/frontend/js/ide/connection/ConnectionManager.js
View file

@ -258,6 +258,7 @@ The editor will refresh in automatically in 10 seconds.\
// initial connection
} else if (state === 'reconnecting') {
// reconnection after a connection has failed
this.stopReconnectCountdownTimer()
this.$scope.connection.reconnecting = true
// if reconnecting takes more than 1s (it doesn't, usually) show the
// 'reconnecting...' warning
@ -278,10 +279,10 @@ The editor will refresh in automatically in 10 seconds.\
// project has been joined
} else if (state === 'waitingCountdown') {
// disconnected and waiting to reconnect via the countdown timer
this.cancelReconnect()
this.stopReconnectCountdownTimer()
} else if (state === 'waitingGracefully') {
// disconnected and waiting to reconnect gracefully
this.cancelReconnect()
this.stopReconnectCountdownTimer()
} else if (state === 'inactive') {
// disconnected and not trying to reconnect (inactive)
} else if (state === 'error') {
@ -444,7 +445,7 @@ Something went wrong connecting to your project. Please refresh if this continue
})
setTimeout(() => {
if (!this.connected) {
if (!this.connected && !this.countdownTimeoutId) {
this.countdownTimeoutId = setTimeout(
() => this.decreaseCountdown(connectionId),
1000
@ -453,8 +454,7 @@ Something went wrong connecting to your project. Please refresh if this continue
}, 200)
}
cancelReconnect() {
this.disconnect()
stopReconnectCountdownTimer() {
// clear timeout and set to null so we know there is no countdown running
if (this.countdownTimeoutId != null) {
sl_console.log(