From f5d82b1aea4f786977fe6f193677c03d7dad7c09 Mon Sep 17 00:00:00 2001 From: Ricardo Garim Date: Mon, 22 Jun 2026 11:46:07 -0300 Subject: [PATCH] chore: use @rocket.chat/logger in presence service --- ee/packages/presence/package.json | 1 + ee/packages/presence/src/Presence.ts | 16 ++++++++++------ ee/packages/presence/src/lib/PresenceReaper.ts | 5 ++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index e4c937b93b140..847bfca193bff 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -18,6 +18,7 @@ "dependencies": { "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", + "@rocket.chat/logger": "workspace:^", "@rocket.chat/models": "workspace:^", "mongodb": "6.16.0" }, diff --git a/ee/packages/presence/src/Presence.ts b/ee/packages/presence/src/Presence.ts index 70d4ae0168f0b..2e44936d7933e 100755 --- a/ee/packages/presence/src/Presence.ts +++ b/ee/packages/presence/src/Presence.ts @@ -4,12 +4,15 @@ import type { IPresence, IBrokerNode } from '@rocket.chat/core-services'; import { License, ServiceClass, Settings } from '@rocket.chat/core-services'; import type { IUser } from '@rocket.chat/core-typings'; import { UserStatus } from '@rocket.chat/core-typings'; +import { Logger } from '@rocket.chat/logger'; import { Users, UsersSessions } from '@rocket.chat/models'; import { PresenceReaper } from './lib/PresenceReaper'; import { normalizeStatusText } from './lib/normalizeStatusText'; import { type ClaimUpdate, processPresence } from './lib/presenceEngine'; +const logger = new Logger('Presence'); + const MAX_CONNECTIONS = 200; const MAX_TIMEOUT_DELAY_MS = 2 ** 31 - 1; @@ -146,7 +149,7 @@ export class Presence extends ServiceClass implements IPresence { const delay = Math.min(Math.max(next.statusExpiresAt.getTime() - Date.now(), 0), MAX_TIMEOUT_DELAY_MS); this.expirationTimeout = setTimeout(() => { this.expirationTimeout = undefined; - this.handleExpirationJob().catch((err) => console.error('[Presence] Error handling status expiration:', err)); + this.handleExpirationJob().catch((err) => logger.error({ msg: 'Error handling status expiration', err })); }, delay); } @@ -161,14 +164,15 @@ export class Presence extends ServiceClass implements IPresence { const rejected = results.filter((result) => result.status === 'rejected'); if (fulfilled.length > 0) { - console.debug(`[PresenceReaper] Successfully updated presence for ${fulfilled.length} users.`); + logger.debug({ msg: 'Successfully updated presence for users', count: fulfilled.length }); } if (rejected.length > 0) { - console.error( - `[PresenceReaper] Failed to update presence for ${rejected.length} users:`, - rejected.map(({ reason }) => reason), - ); + logger.error({ + msg: 'Failed to update presence for users', + count: rejected.length, + reasons: rejected.map(({ reason }): unknown => reason), + }); } } diff --git a/ee/packages/presence/src/lib/PresenceReaper.ts b/ee/packages/presence/src/lib/PresenceReaper.ts index 969465229cad1..7df6539ed911e 100644 --- a/ee/packages/presence/src/lib/PresenceReaper.ts +++ b/ee/packages/presence/src/lib/PresenceReaper.ts @@ -1,9 +1,12 @@ import { setInterval } from 'node:timers'; import type { IUserSession } from '@rocket.chat/core-typings'; +import { Logger } from '@rocket.chat/logger'; import { UsersSessions } from '@rocket.chat/models'; import type { AnyBulkWriteOperation } from 'mongodb'; +const logger = new Logger('PresenceReaper'); + type ReaperPlan = { userId: string; removeIds: NonEmptyArray; @@ -48,7 +51,7 @@ export class PresenceReaper { // Run every 1 minute this.intervalId = setInterval(() => { - this.run().catch((err) => console.error('[PresenceReaper] Error:', err)); + this.run().catch((err) => logger.error({ msg: 'Error running presence reaper', err })); }, 60 * 1000); }