From 483ffadd25f4cfb5a74ee49181ab1e33bbf3da13 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 24 Aug 2022 13:49:27 -0300 Subject: [PATCH] Review --- .../externals/meteor/konecty-multiple-instances-status.d.ts | 2 ++ apps/meteor/server/startup/{instance.js => instance.ts} | 0 apps/meteor/server/stream/streamBroadcast.js | 5 +++++ 3 files changed, 7 insertions(+) rename apps/meteor/server/startup/{instance.js => instance.ts} (100%) diff --git a/apps/meteor/definition/externals/meteor/konecty-multiple-instances-status.d.ts b/apps/meteor/definition/externals/meteor/konecty-multiple-instances-status.d.ts index 2e90067003ebc..b640566183995 100644 --- a/apps/meteor/definition/externals/meteor/konecty-multiple-instances-status.d.ts +++ b/apps/meteor/definition/externals/meteor/konecty-multiple-instances-status.d.ts @@ -1,5 +1,7 @@ declare module 'meteor/konecty:multiple-instances-status' { namespace InstanceStatus { function id(): string; + + function registerInstance(name: string, instance: Record): void; } } diff --git a/apps/meteor/server/startup/instance.js b/apps/meteor/server/startup/instance.ts similarity index 100% rename from apps/meteor/server/startup/instance.js rename to apps/meteor/server/startup/instance.ts diff --git a/apps/meteor/server/stream/streamBroadcast.js b/apps/meteor/server/stream/streamBroadcast.js index 5a4cd0567b0ab..e92ed4cab0977 100644 --- a/apps/meteor/server/stream/streamBroadcast.js +++ b/apps/meteor/server/stream/streamBroadcast.js @@ -4,6 +4,7 @@ import { InstanceStatus } from 'meteor/konecty:multiple-instances-status'; import { check } from 'meteor/check'; import { DDP } from 'meteor/ddp'; import { InstanceStatus as InstanceStatusRaw } from '@rocket.chat/models'; +import { TAPi18n } from 'meteor/rocketchat:tap-i18n'; import { Logger } from '../lib/logger/Logger'; import { hasPermission } from '../../app/authorization/server'; @@ -67,6 +68,10 @@ function startMatrixBroadcast() { added: Meteor.bindEnvironment((record) => { cache.set(record._id, record); + if (cache.size() > 1) { + logger.warn(TAPi18n.__('Multiple_monolith_instances_alert')); + } + const subPath = getURL('', { cdn: false, full: false }); let instance = `${record.extraInformation.host}:${record.extraInformation.port}${subPath}`;