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

More incorrect logger use (#4904)

Browse Source 
A couple of places where we were still using the legacy logger
This commit is contained in:
Richard van der Hoff
2025-07-08 16:37:17 +01:00
committed by GitHub
parent 024b62bba0
commit 06a1e1a88a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client.ts
View File

@@ -2209,7 +2209,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
): Promise<EmptyObject> { ): Promise<EmptyObject> {
// If the sync loop is not running, fall back to setAccountDataRaw. // If the sync loop is not running, fall back to setAccountDataRaw.
if (!this.clientRunning) { if (!this.clientRunning) {
logger.warn( this.logger.warn(
"Calling `setAccountData` before the client is started: `getAccountData` may return inconsistent results.", "Calling `setAccountData` before the client is started: `getAccountData` may return inconsistent results.",
); );
return await retryNetworkOperation(5, () => this.setAccountDataRaw(eventType, content)); return await retryNetworkOperation(5, () => this.setAccountDataRaw(eventType, content));

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

@@ -30,7 +30,7 @@ import {
DecryptionError, DecryptionError,
type OnSyncCompletedData, type OnSyncCompletedData,
} from "../common-crypto/CryptoBackend.ts"; } from "../common-crypto/CryptoBackend.ts";
import { logger, type Logger, LogSpan } from "../logger.ts"; import { type Logger, LogSpan } from "../logger.ts";
import { type IHttpOpts, type MatrixHttpApi, Method } from "../http-api/index.ts"; import { type IHttpOpts, type MatrixHttpApi, Method } from "../http-api/index.ts";
import { RoomEncryptor } from "./RoomEncryptor.ts"; import { RoomEncryptor } from "./RoomEncryptor.ts";
import { OutgoingRequestProcessor } from "./OutgoingRequestProcessor.ts"; import { OutgoingRequestProcessor } from "./OutgoingRequestProcessor.ts";
@@ -826,18 +826,18 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, CryptoEventH
private async saveBackupKeyToStorage(): Promise<void> { private async saveBackupKeyToStorage(): Promise<void> {
const keyBackupInfo = await this.backupManager.getServerBackupInfo(); const keyBackupInfo = await this.backupManager.getServerBackupInfo();
if (!keyBackupInfo || !keyBackupInfo.version) { if (!keyBackupInfo || !keyBackupInfo.version) {
logger.info("Not saving backup key to secret storage: no backup info"); this.logger.info("Not saving backup key to secret storage: no backup info");
return; return;
} }
const backupKeys: RustSdkCryptoJs.BackupKeys = await this.olmMachine.getBackupKeys(); const backupKeys: RustSdkCryptoJs.BackupKeys = await this.olmMachine.getBackupKeys();
if (!backupKeys.decryptionKey) { if (!backupKeys.decryptionKey) {
logger.info("Not saving backup key to secret storage: no backup key"); this.logger.info("Not saving backup key to secret storage: no backup key");
return; return;
} }
if (!decryptionKeyMatchesKeyBackupInfo(backupKeys.decryptionKey, keyBackupInfo)) { if (!decryptionKeyMatchesKeyBackupInfo(backupKeys.decryptionKey, keyBackupInfo)) {
logger.info("Not saving backup key to secret storage: decryption key does not match backup info"); this.logger.info("Not saving backup key to secret storage: decryption key does not match backup info");
return; return;
} }
@@ -1262,7 +1262,7 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, CryptoEventH
if (info?.version) { if (info?.version) {
await this.deleteKeyBackupVersion(info.version); await this.deleteKeyBackupVersion(info.version);
} else { } else {
logger.error("Can't delete key backup version: no version available"); this.logger.error("Can't delete key backup version: no version available");
} }
// also turn off 4S, since this is also storing keys on the server. // also turn off 4S, since this is also storing keys on the server.