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

server-ts: Port becca_loader

Browse Source
This commit is contained in:
Elian Doran
2024-02-17 20:45:31 +02:00
parent 3d5ef81860
commit d35613f510
13 changed files with 61 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/consistency_checks.js
View File

@@ -766,7 +766,7 @@ class ConsistencyChecks {
}
if (this.reloadNeeded) {
require('../becca/becca_loader.js').reload("consistency checks need becca reload");
require('../becca/becca_loader').reload("consistency checks need becca reload");
}
return !this.unrecoveredConsistencyErrors;

6
src/services/sql.ts
View File

@@ -143,8 +143,8 @@ function getRows<T>(query: string, params: Params = []): T[] {
return wrap(query, s => s.all(params)) as T[];
}
function getRawRows<T extends {} | unknown[]>(query: string, params: Params = []): T[] | null {
return wrap(query, s => s.raw().all(params)) as T[] | null;
function getRawRows<T extends {} | unknown[]>(query: string, params: Params = []): T[] {
return (wrap(query, s => s.raw().all(params)) as T[] | null) || [];
}
function iterateRows(query: string, params: Params = []) {
@@ -259,7 +259,7 @@ function transactional<T>(func: (statement: Statement) => T) {
if (entityChangeIds.length > 0) {
log.info("Transaction rollback dirtied the becca, forcing reload.");
require('../becca/becca_loader.js').load();
require('../becca/becca_loader').load();
}
// the maxEntityChangeId has been incremented during failed transaction, need to recalculate

2
src/services/sql_init.ts
View File

@@ -61,7 +61,7 @@ async function createInitialDatabase() {
sql.executeScript(schema);
require('../becca/becca_loader.js').load();
require('../becca/becca_loader').load();
const BNote = require('../becca/entities/bnote');
const BBranch = require('../becca/entities/bbranch');

2
src/services/sync.js
View File

@@ -399,7 +399,7 @@ function getOutstandingPullCount() {
return outstandingPullCount;
}
require('../becca/becca_loader.js').beccaLoaded.then(() => {
require('../becca/becca_loader').beccaLoaded.then(() => {
setInterval(cls.wrap(sync), 60000);
// kickoff initial sync immediately, but should happen after initial consistency checks