mirror of
https://github.com/zadam/trilium.git
synced 2025-06-06 18:08:33 +02:00
backup is now triggered after start of the app and with timer
This commit is contained in:
parent
94a0f3e041
commit
c5f80051ae
4
app.js
4
app.js
@ -97,6 +97,10 @@ app.use((err, req, res, next) => {
|
|||||||
log.error(err.message);
|
log.error(err.message);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// triggers sync timer
|
||||||
require('./services/sync');
|
require('./services/sync');
|
||||||
|
|
||||||
|
// triggers backup timer
|
||||||
|
require('./services/backup');
|
||||||
|
|
||||||
module.exports = app;
|
module.exports = app;
|
@ -4,12 +4,9 @@ const express = require('express');
|
|||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
const sql = require('../../services/sql');
|
const sql = require('../../services/sql');
|
||||||
const utils = require('../../services/utils');
|
const utils = require('../../services/utils');
|
||||||
const backup = require('../../services/backup');
|
|
||||||
const auth = require('../../services/auth');
|
const auth = require('../../services/auth');
|
||||||
|
|
||||||
router.get('/', auth.checkApiAuth, async (req, res, next) => {
|
router.get('/', auth.checkApiAuth, async (req, res, next) => {
|
||||||
await backup.regularBackup();
|
|
||||||
|
|
||||||
const notes = await sql.getResults("select "
|
const notes = await sql.getResults("select "
|
||||||
+ "notes_tree.*, "
|
+ "notes_tree.*, "
|
||||||
+ "COALESCE(clone.note_title, notes.note_title) as note_title, "
|
+ "COALESCE(clone.note_title, notes.note_title) as note_title, "
|
||||||
|
@ -6,10 +6,6 @@ const fs = require('fs-extra');
|
|||||||
const dataDir = require('./data_dir');
|
const dataDir = require('./data_dir');
|
||||||
const log = require('./log');
|
const log = require('./log');
|
||||||
|
|
||||||
if (!fs.existsSync(dataDir.BACKUP_DIR)) {
|
|
||||||
fs.mkdirSync(dataDir.BACKUP_DIR, 0o700);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function regularBackup() {
|
async function regularBackup() {
|
||||||
const now = utils.nowTimestamp();
|
const now = utils.nowTimestamp();
|
||||||
const last_backup_date = parseInt(await sql.getOption('last_backup_date'));
|
const last_backup_date = parseInt(await sql.getOption('last_backup_date'));
|
||||||
@ -55,7 +51,15 @@ async function cleanupOldBackups() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!fs.existsSync(dataDir.BACKUP_DIR)) {
|
||||||
|
fs.mkdirSync(dataDir.BACKUP_DIR, 0o700);
|
||||||
|
}
|
||||||
|
|
||||||
|
setInterval(regularBackup, 60 * 60 * 1000);
|
||||||
|
|
||||||
|
// kickoff backup immediately
|
||||||
|
setTimeout(regularBackup, 1000);
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
regularBackup,
|
|
||||||
backupNow
|
backupNow
|
||||||
};
|
};
|
Loading…
x
Reference in New Issue
Block a user