From 521114822690d52136d5b3ee781e22cc866ba9cf Mon Sep 17 00:00:00 2001 From: Debdut Chakraborty Date: Wed, 11 Sep 2024 17:21:06 +0530 Subject: [PATCH 1/4] move sync created to async started --- apps/meteor/ee/server/local-services/federation/service.ts | 4 ++-- apps/meteor/server/services/federation/service.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/meteor/ee/server/local-services/federation/service.ts b/apps/meteor/ee/server/local-services/federation/service.ts index 5c6e210aefb8..a7dabc3b9a09 100644 --- a/apps/meteor/ee/server/local-services/federation/service.ts +++ b/apps/meteor/ee/server/local-services/federation/service.ts @@ -133,7 +133,7 @@ abstract class AbstractBaseFederationServiceEE extends AbstractFederationService await super.cleanUpHandlers(); } - public async created(): Promise { + public async started(): Promise { await super.setupFederation(); await this.startFederation(); } @@ -213,7 +213,7 @@ export class FederationServiceEE extends AbstractBaseFederationServiceEE impleme return federationService; } - async created(): Promise { + async started(): Promise { return super.created(); } diff --git a/apps/meteor/server/services/federation/service.ts b/apps/meteor/server/services/federation/service.ts index 904e73913a17..346ca1c4a4e7 100644 --- a/apps/meteor/server/services/federation/service.ts +++ b/apps/meteor/server/services/federation/service.ts @@ -414,7 +414,7 @@ abstract class AbstractBaseFederationService extends AbstractFederationService { await super.cleanUpSettingObserver(); } - public async created(): Promise { + public async started(): Promise { await super.setupFederation(); await this.startFederation(); } @@ -447,8 +447,8 @@ export class FederationService extends AbstractBaseFederationService implements return super.stopped(); } - public async created(): Promise { - return super.created(); + public async started(): Promise { + return super.started(); } public async verifyConfiguration(): Promise { From 661fc14377c3f3ea040e3a333c5c5727a26d27ad Mon Sep 17 00:00:00 2001 From: Debdut Chakraborty Date: Wed, 11 Sep 2024 17:24:13 +0530 Subject: [PATCH 2/4] Update apps/meteor/ee/server/local-services/federation/service.ts --- apps/meteor/ee/server/local-services/federation/service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/ee/server/local-services/federation/service.ts b/apps/meteor/ee/server/local-services/federation/service.ts index a7dabc3b9a09..c4ad6b30785e 100644 --- a/apps/meteor/ee/server/local-services/federation/service.ts +++ b/apps/meteor/ee/server/local-services/federation/service.ts @@ -214,7 +214,7 @@ export class FederationServiceEE extends AbstractBaseFederationServiceEE impleme } async started(): Promise { - return super.created(); + return super.started(); } async stopped(): Promise { From 213904c49c9a45d666d5a4b172707027e9b8cba4 Mon Sep 17 00:00:00 2001 From: Debdut Chakraborty Date: Thu, 17 Oct 2024 19:02:40 +0530 Subject: [PATCH 3/4] add changeset --- .changeset/green-queens-end.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/green-queens-end.md diff --git a/.changeset/green-queens-end.md b/.changeset/green-queens-end.md new file mode 100644 index 000000000000..b4373455326d --- /dev/null +++ b/.changeset/green-queens-end.md @@ -0,0 +1,5 @@ +--- +"@rocket.chat/meteor": patch +--- + +Fixes an issue with Federation startup where the bridge would intermittently fail to start causing errors being thrown "Matrix Bridge isn't running yet". From 4d232bcfadaf381c10daccf65381917f3e9e11d0 Mon Sep 17 00:00:00 2001 From: Debdut Chakraborty Date: Thu, 17 Oct 2024 19:03:26 +0530 Subject: [PATCH 4/4] Update .changeset/green-queens-end.md --- .changeset/green-queens-end.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/green-queens-end.md b/.changeset/green-queens-end.md index b4373455326d..d6cf413bfcf6 100644 --- a/.changeset/green-queens-end.md +++ b/.changeset/green-queens-end.md @@ -2,4 +2,4 @@ "@rocket.chat/meteor": patch --- -Fixes an issue with Federation startup where the bridge would intermittently fail to start causing errors being thrown "Matrix Bridge isn't running yet". +Fixes an issue with Federation startup where the bridge would intermittently fail to start causing error being shown "Matrix Bridge isn't running yet".