Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(federation-v2): await bridge startup #33253

Merged
merged 12 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading