Merge branch 'fix/last-disconnect-margin' into 'master'

add 30 sec margin to ws last disconnect to account for timeouts See merge request kchat/webapp!549
Infomaniak · Oct 9, 2023 · 0024ff9 · 0024ff9
2 parents eb4dccb + ba108eb
commit 0024ff9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/actions/websocket_actions.jsx b/actions/websocket_actions.jsx
@@ -390,10 +390,15 @@ function handleClose(failCount) {
     if (failCount > MAX_WEBSOCKET_FAILS) {
         dispatch(logError({type: 'critical', message: AnnouncementBarMessages.WEBSOCKET_PORT_ERROR}, true));
     }
+
+    // Subtract 30 sec to account for ws disconnection timeout
+    const nowTimestamp = Date.now();
+    const thirtySecondsAgoTimestamp = nowTimestamp - (30 * 1000);
+
     dispatch(batchActions([
         {
             type: GeneralTypes.WEBSOCKET_FAILURE,
-            timestamp: Date.now(),
+            timestamp: thirtySecondsAgoTimestamp,
         },
         incrementWsErrorCount(),
     ]));