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.

Sign up for GitHub

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

Jump to bottom

Create a new ping room if the previous room cannot be reached #752

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Create a new ping room if the previous room cannot be reached #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f579f0
Create a new ping room if the previous room cannot be reached
Half-Shot May 2, 2023
c82f6b9
changelog
Half-Shot May 2, 2023
d25f6f2
Update 752.bugfix
Half-Shot May 2, 2023
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
1 change: 1 addition & 0 deletions changelog.d/752.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a case where the bridge will fail to start if it cannot access it's internal ping room.
13 changes: 12 additions & 1 deletion src/Main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,12 +1707,23 @@ export class Main {

private async pingBridge() {
let internalRoom: string|null;
const intent = this.bridge.getIntent();
try {
internalRoom = await this.datastore.getUserAdminRoom("-internal-");
if (internalRoom) {
try {
await intent.join(internalRoom);
} catch (ex) {
// Unable to join the room, probably broken. Create another.
internalRoom = null;
}
}

if (!internalRoom) {
internalRoom = (await this.bridge.getIntent().createRoom({ options: {}})).room_id;
internalRoom = (await intent.createRoom({ options: {}})).room_id;
await this.datastore.setUserAdminRoom("-internal-", internalRoom);
}

const time = await this.bridge.pingAppserviceRoute(internalRoom);
log.info(`Successfully pinged the bridge. Round trip took ${time}ms`);
}
Expand Down