Skip to content

Commit

Permalink
fix(federation-v2): await bridge startup (#33253)
Browse files Browse the repository at this point in the history
  • Loading branch information
debdutdeb authored Dec 11, 2024
1 parent ac79766 commit 6799f09
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .changeset/green-queens-end.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes an issue with Federation startup where the bridge would intermittently fail to start causing error being shown "Matrix Bridge isn't running yet".
6 changes: 3 additions & 3 deletions apps/meteor/ee/server/local-services/federation/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ abstract class AbstractBaseFederationServiceEE extends AbstractFederationService
await super.cleanUpHandlers();
}

public async created(): Promise<void> {
public async started(): Promise<void> {
await super.setupFederation();
await this.startFederation();
}
Expand Down Expand Up @@ -213,8 +213,8 @@ export class FederationServiceEE extends AbstractBaseFederationServiceEE impleme
return federationService;
}

async created(): Promise<void> {
return super.created();
async started(): Promise<void> {
return super.started();
}

async stopped(): Promise<void> {
Expand Down
6 changes: 3 additions & 3 deletions apps/meteor/server/services/federation/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ abstract class AbstractBaseFederationService extends AbstractFederationService {
await super.cleanUpSettingObserver();
}

public async created(): Promise<void> {
public async started(): Promise<void> {
await super.setupFederation();
await this.startFederation();
}
Expand Down Expand Up @@ -447,8 +447,8 @@ export class FederationService extends AbstractBaseFederationService implements
return super.stopped();
}

public async created(): Promise<void> {
return super.created();
public async started(): Promise<void> {
return super.started();
}

public async verifyConfiguration(): Promise<void> {
Expand Down

0 comments on commit 6799f09

Please sign in to comment.