nodejs/hookshot
nodejs/hookshot
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-hookshot.git synced 2025-03-10 13:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix hang in crypto reset script when E2EE is off (#723)

Browse Source 
Ensure that the bridge storage is always disconnected
This commit is contained in:
Andrew Ferrazzutti 2023-04-21 23:57:40 +09:00 committed by GitHub
parent f29fac7584
commit 9bd46e4dc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/App/ResetCryptoStore.ts
View File

@ -5,9 +5,12 @@ import { Logger } from "matrix-appservice-bridge";
import { LogService, MatrixClient } from "matrix-bot-sdk";
import { getAppservice } from "../appservice";
import BotUsersManager from "../Managers/BotUsersManager";
import { IBridgeStorageProvider } from "../Stores/StorageProvider";
const log = new Logger("ResetCryptoStore");
let bridgeStorage: IBridgeStorageProvider | undefined;
async function start() {
const configFile = process.argv[2] || "./config.yml";
const registrationFile = process.argv[3] || "./registration.yml";
@ -22,6 +25,7 @@ async function start() {
LogService.setLogger(Logger.botSdkLogger);
const {appservice, storage, cryptoStorage} = getAppservice(config, registration);
bridgeStorage = storage;
if (!cryptoStorage) {
log.info(`Encryption is not enabled in the configuration file "${configFile}", so there is no encryption state to be reset`);
return;
@ -80,10 +84,10 @@ async function start() {
log.error("Failed to remove crypto store from disk", ex);
}
}
await storage.disconnect?.();
}
start().catch((ex) => {
log.error("ResetCryptoStore encountered an error and has stopped:", ex);
}).finally(() => {
bridgeStorage?.disconnect?.();
});