Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-02 11:26:15 +01:00
Code Issues Packages Projects Releases Activity

separate DB connection for each transaction (just for the record, will be reverted probably)

Browse Source
This commit is contained in:
azivner
2017-11-28 17:04:47 -05:00
parent 4d95eb0762
commit fd764f6163
21 changed files with 326 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/options.js
View File

@@ -15,38 +15,31 @@ async function getOption(optName) {
return row['opt_value'];
}
async function setOptionInTransaction(optName, optValue) {
await sql.doInTransaction(async () => setOption(optName, optValue));
}
async function setOption(optName, optValue) {
async function setOption(db, optName, optValue) {
if (SYNCED_OPTIONS.includes(optName)) {
await sync_table.addOptionsSync(optName);
}
await setOptionNoSync(optName, optValue);
await setOptionNoSync(db, optName, optValue);
}
async function setOptionNoSync(optName, optValue) {
async function setOptionNoSync(db, optName, optValue) {
const now = utils.nowTimestamp();
await sql.execute("UPDATE options SET opt_value = ?, date_modified = ? WHERE opt_name = ?", [optValue, now, optName]);
await sql.execute(db, "UPDATE options SET opt_value = ?, date_modified = ? WHERE opt_name = ?", [optValue, now, optName]);
}
sql.dbReady.then(async () => {
if (!await getOption('document_id')) {
await setOption('document_id', utils.randomSecureToken(16));
}
if (!await getOption('document_secret')) {
await setOption('document_secret', utils.randomSecureToken(16));
if (!await getOption('document_id') || !await getOption('document_secret')) {
await sql.doInTransaction(async db => {
await setOption(db, 'document_id', utils.randomSecureToken(16));
await setOption(db, 'document_secret', utils.randomSecureToken(16));
});
}
});
module.exports = {
getOption,
setOption,
setOptionNoSync,
setOptionInTransaction,
SYNCED_OPTIONS
};