From 0e1379688206af54a55904d1979ee70bb2a34e40 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Fri, 16 May 2025 09:23:23 +0100
Subject: [PATCH] [real-time] bail out early upon hitting a redis error
 (#25614)

GitOrigin-RevId: 2563094d1ec8017450fdfdb2b0e77d74bbc825d1
---
 services/real-time/app/js/ConnectedUsersManager.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/real-time/app/js/ConnectedUsersManager.js b/services/real-time/app/js/ConnectedUsersManager.js
index 9b26add4c9..4ce3dcdcad 100644
--- a/services/real-time/app/js/ConnectedUsersManager.js
+++ b/services/real-time/app/js/ConnectedUsersManager.js
@@ -89,13 +89,14 @@ module.exports = {
     multi.exec(function (err, res) {
       if (err) {
         err = new OError('problem marking user as connected').withCause(err)
+        return callback(err)
       }
       const [, nConnectedClients] = res
       Metrics.inc('editing_session_mode', 1, {
         method: cursorData ? 'update' : 'connect',
         status: nConnectedClients === 1 ? 'single' : 'multi',
       })
-      callback(err)
+      callback(null)
     })
   },
 
@@ -136,6 +137,7 @@ module.exports = {
     multi.exec(function (err, res) {
       if (err) {
         err = new OError('problem marking user as disconnected').withCause(err)
+        return callback(err)
       }
       const [, nConnectedClients] = res
       const status =
@@ -183,7 +185,7 @@ module.exports = {
           }
         })
       }
-      callback(err)
+      callback(null)
     })
   },