regression: do not update logged out sessions (#35041)

RocketChat · Jan 27, 2025 · db58b23 · db58b23
1 parent 2387725
commit db58b23
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/apps/meteor/app/statistics/server/lib/SAUMonitor.ts b/apps/meteor/app/statistics/server/lib/SAUMonitor.ts
@@ -30,6 +30,8 @@ const getUserRoles = mem(
 	{ maxAge: 5000 },
 );
 
+const isProdEnv = process.env.NODE_ENV === 'production';
+
 /**
  * Server Session Monitor for SAU(Simultaneously Active Users) based on Meteor server sessions
  */
@@ -143,7 +145,11 @@ export class SAUMonitorClass {
 				projection: { loginToken: 1 },
 			});
 			if (!session?.loginToken) {
-				throw new Error('Session not found');
+				if (!isProdEnv) {
+					throw new Error('Session not found during logout');
+				}
+				logger.error('Session not found during logout', { userId, sessionId });
+				return;
 			}
 
 			await Sessions.logoutBySessionIdAndUserId({ loginToken: session.loginToken, userId });

diff --git a/packages/models/src/models/Sessions.ts b/packages/models/src/models/Sessions.ts
@@ -1442,8 +1442,10 @@ export class SessionsRaw extends BaseRaw<ISession> implements ISessionsModel {
 
 		const now = new Date();
 
+		const query = { instanceId, sessionId, year, month, day, logoutAt: { $exists: false } };
+
 		return this.updateOne(
-			{ instanceId, sessionId, year, month, day },
+			query,
 			{
 				$set: data,
 				$setOnInsert: {