Skip to content

Commit 06a1e1a

Browse files
authored
More incorrect logger use (#4904)
A couple of places where we were still using the legacy logger
1 parent 024b62b commit 06a1e1a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,7 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
22092209
): Promise<EmptyObject> {
22102210
// If the sync loop is not running, fall back to setAccountDataRaw.
22112211
if (!this.clientRunning) {
2212-
logger.warn(
2212+
this.logger.warn(
22132213
"Calling `setAccountData` before the client is started: `getAccountData` may return inconsistent results.",
22142214
);
22152215
return await retryNetworkOperation(5, () => this.setAccountDataRaw(eventType, content));

src/rust-crypto/rust-crypto.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {
3030
DecryptionError,
3131
type OnSyncCompletedData,
3232
} from "../common-crypto/CryptoBackend.ts";
33-
import { logger, type Logger, LogSpan } from "../logger.ts";
33+
import { type Logger, LogSpan } from "../logger.ts";
3434
import { type IHttpOpts, type MatrixHttpApi, Method } from "../http-api/index.ts";
3535
import { RoomEncryptor } from "./RoomEncryptor.ts";
3636
import { OutgoingRequestProcessor } from "./OutgoingRequestProcessor.ts";
@@ -826,18 +826,18 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, CryptoEventH
826826
private async saveBackupKeyToStorage(): Promise<void> {
827827
const keyBackupInfo = await this.backupManager.getServerBackupInfo();
828828
if (!keyBackupInfo || !keyBackupInfo.version) {
829-
logger.info("Not saving backup key to secret storage: no backup info");
829+
this.logger.info("Not saving backup key to secret storage: no backup info");
830830
return;
831831
}
832832

833833
const backupKeys: RustSdkCryptoJs.BackupKeys = await this.olmMachine.getBackupKeys();
834834
if (!backupKeys.decryptionKey) {
835-
logger.info("Not saving backup key to secret storage: no backup key");
835+
this.logger.info("Not saving backup key to secret storage: no backup key");
836836
return;
837837
}
838838

839839
if (!decryptionKeyMatchesKeyBackupInfo(backupKeys.decryptionKey, keyBackupInfo)) {
840-
logger.info("Not saving backup key to secret storage: decryption key does not match backup info");
840+
this.logger.info("Not saving backup key to secret storage: decryption key does not match backup info");
841841
return;
842842
}
843843

@@ -1262,7 +1262,7 @@ export class RustCrypto extends TypedEventEmitter<RustCryptoEvents, CryptoEventH
12621262
if (info?.version) {
12631263
await this.deleteKeyBackupVersion(info.version);
12641264
} else {
1265-
logger.error("Can't delete key backup version: no version available");
1265+
this.logger.error("Can't delete key backup version: no version available");
12661266
}
12671267

12681268
// also turn off 4S, since this is also storing keys on the server.

0 commit comments

Comments
 (0)