Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-31 21:11:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

make sure to wait for DB connection to be up before starting ...

Browse Source
This commit is contained in:
zadam 2019-04-02 19:42:41 +02:00
parent 9ca4a016eb
commit 2259e1d44d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electron.js
View File

@ -30,6 +30,8 @@ function onClosed() {
} }
async function createMainWindow() { async function createMainWindow() {
await sqlInit.dbConnection;
// if schema doesn't exist -> setup process // if schema doesn't exist -> setup process
// if schema exists, then we need to wait until the migration process is finished // if schema exists, then we need to wait until the migration process is finished
if (await sqlInit.schemaExists()) { if (await sqlInit.schemaExists()) {

13
src/services/sql_init.js
View File

@ -14,13 +14,19 @@ async function createConnection() {
return await sqlite.open(dataDir.DOCUMENT_PATH, {Promise}); return await sqlite.open(dataDir.DOCUMENT_PATH, {Promise});
} }
const dbConnection = new Promise(async (resolve, reject) => {
// no need to create new connection now since DB stays the same all the time
const db = await createConnection();
sql.setDbConnection(db);
resolve();
});
let dbReadyResolve = null; let dbReadyResolve = null;
const dbReady = new Promise(async (resolve, reject) => { const dbReady = new Promise(async (resolve, reject) => {
dbReadyResolve = resolve; dbReadyResolve = resolve;
// no need to create new connection now since DB stays the same all the time await dbConnection;
const db = await createConnection();
sql.setDbConnection(db);
initDbConnection(); initDbConnection();
}); });
@ -165,6 +171,7 @@ dbReady.then(async () => {
module.exports = { module.exports = {
dbReady, dbReady,
dbConnection,
schemaExists, schemaExists,
isDbInitialized, isDbInitialized,
initDbConnection, initDbConnection,