Skip to content

Commit 361c636

Browse files
committed
additionally fix MatrixRTCSessionManager being initialized before the extension is in place.
1 parent b9a0660 commit 361c636

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/matrixrtc/MatrixRTCSessionManager.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
import { logger as rootLogger } from "../logger.ts";
17+
import { logger as rootLogger, type Logger } from "../logger.ts";
1818
import { type MatrixClient, ClientEvent } from "../client.ts";
1919
import { TypedEventEmitter } from "../models/typed-event-emitter.ts";
2020
import { type Room } from "../models/room.ts";
@@ -23,8 +23,6 @@ import { type MatrixEvent } from "../models/event.ts";
2323
import { MatrixRTCSession } from "./MatrixRTCSession.ts";
2424
import { EventType } from "../@types/event.ts";
2525

26-
const logger = rootLogger.getChild("[MatrixRTCSessionManager]");
27-
2826
export enum MatrixRTCSessionManagerEvents {
2927
// A member has joined the MatrixRTC session, creating an active session in a room where there wasn't previously
3028
SessionStarted = "session_started",
@@ -50,8 +48,10 @@ export class MatrixRTCSessionManager extends TypedEventEmitter<MatrixRTCSessionM
5048
// longer the correct session object for the room.
5149
private roomSessions = new Map<string, MatrixRTCSession>();
5250

51+
private logger: Logger;
5352
public constructor(private client: MatrixClient) {
5453
super();
54+
this.logger = rootLogger.getChild("[MatrixRTCSessionManager]");
5555
}
5656

5757
public start(): void {
@@ -105,7 +105,7 @@ export class MatrixRTCSessionManager extends TypedEventEmitter<MatrixRTCSessionM
105105
private onRoomState = (event: MatrixEvent, _state: RoomState): void => {
106106
const room = this.client.getRoom(event.getRoomId());
107107
if (!room) {
108-
logger.error(`Got room state event for unknown room ${event.getRoomId()}!`);
108+
this.logger.error(`Got room state event for unknown room ${event.getRoomId()}!`);
109109
return;
110110
}
111111

@@ -129,10 +129,10 @@ export class MatrixRTCSessionManager extends TypedEventEmitter<MatrixRTCSessionM
129129
const nowActive = session.memberships.length > 0;
130130

131131
if (wasActiveAndKnown && !nowActive) {
132-
logger.trace(`Session ended for ${room.roomId} (${session.memberships.length} members)`);
132+
this.logger.trace(`Session ended for ${room.roomId} (${session.memberships.length} members)`);
133133
this.emit(MatrixRTCSessionManagerEvents.SessionEnded, room.roomId, this.roomSessions.get(room.roomId)!);
134134
} else if (!wasActiveAndKnown && nowActive) {
135-
logger.trace(`Session started for ${room.roomId} (${session.memberships.length} members)`);
135+
this.logger.trace(`Session started for ${room.roomId} (${session.memberships.length} members)`);
136136
this.emit(MatrixRTCSessionManagerEvents.SessionStarted, room.roomId, this.roomSessions.get(room.roomId)!);
137137
}
138138
}

0 commit comments

Comments
 (0)