matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-07 23:02:56 +03:00
Code Activity

Avoid <sender>|<session> notation in log messages (#4473)

Browse Source 
We used to use the notation `<sender key>|<megolm session id>` fairly widely in
log messages, but since the transition to rust crypto, it's unusual and now
somewhat confusing. Make the log messages more explicit.
This commit is contained in:
Richard van der Hoff
2024-10-25 13:48:44 +01:00
committed by GitHub
parent f891fe4423
commit 3cc3bd0728
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rust-crypto/rust-crypto.ts
View File

@@ -1537,7 +1537,7 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, CryptoEventH
private onRoomKeyUpdated(key: RustSdkCryptoJs.RoomKeyInfo): void { private onRoomKeyUpdated(key: RustSdkCryptoJs.RoomKeyInfo): void {
if (this.stopped) return; if (this.stopped) return;
this.logger.debug( this.logger.debug(
`Got update for session ${key.senderKey.toBase64()}|${key.sessionId} in ${key.roomId.toString()}`, `Got update for session ${key.sessionId} from sender ${key.senderKey.toBase64()} in ${key.roomId.toString()}`,
); );
const pendingList = this.eventDecryptor.getEventsPendingRoomKey(key.roomId.toString(), key.sessionId); const pendingList = this.eventDecryptor.getEventsPendingRoomKey(key.roomId.toString(), key.sessionId);
if (pendingList.length === 0) return; if (pendingList.length === 0) return;
@@ -1842,7 +1842,7 @@ class EventDecryptor {
serverBackupInfo: KeyBackupInfo | null | undefined, serverBackupInfo: KeyBackupInfo | null | undefined,
): never { ): never {
const content = event.getWireContent(); const content = event.getWireContent();
const errorDetails = { session: content.sender_key + "|" + content.session_id }; const errorDetails = { sender_key: content.sender_key, session_id: content.session_id };
// If the error looks like it might be recoverable from backup, queue up a request to try that. // If the error looks like it might be recoverable from backup, queue up a request to try that.
if ( if (