supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Import upstream patches from The Lounge (Feb 2024), bump version to v4.4.1-2 #2

Merged
hgw merged 18 commits from upstream-patches-202402 into master 2024-02-02 03:41:49 +00:00
Conversation 0 Commits 18 Files Changed 15 +14 -14
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1b9057d67d - Show all commits

28
server/plugins/messageStorage/sqlite.ts
View File

@ -126,19 +126,8 @@ class SqliteMessageStorage implements SearchableMessageStorage {
this.initDone = new Deferred(); this.initDone = new Deferred();
} }
async _enable() { async _enable(connection_string: string) {
const logsPath = Config.getUserLogsPath(); this.database = new sqlite3.Database(connection_string);
const sqlitePath = path.join(logsPath, `${this.userName}.sqlite3`);
try {
await fs.mkdir(logsPath, { recursive: true });
} catch (e) {
throw Helper.catch_to_error("Unable to create logs directory", e);
}
this.isEnabled = true;
this.database = new sqlite3.Database(sqlitePath);
try { try {
await this.run_pragmas(); // must be done outside of a transaction await this.run_pragmas(); // must be done outside of a transaction
@ -147,11 +136,22 @@ class SqliteMessageStorage implements SearchableMessageStorage {
this.isEnabled = false; this.isEnabled = false;
throw Helper.catch_to_error("Migration failed", e); throw Helper.catch_to_error("Migration failed", e);
} }
this.isEnabled = true;
} }
async enable() { async enable() {
const logsPath = Config.getUserLogsPath();
const sqlitePath = path.join(logsPath, `${this.userName}.sqlite3`);
try { try {
await this._enable(); await fs.mkdir(logsPath, {recursive: true});
} catch (e) {
throw Helper.catch_to_error("Unable to create logs directory", e);
}
try {
await this._enable(sqlitePath);
} finally { } finally {
this.initDone.resolve(); // unblock the instance methods this.initDone.resolve(); // unblock the instance methods
} }