diff --git a/app.js b/app.js index 231f3aa08..520f26e72 100644 --- a/app.js +++ b/app.js @@ -97,6 +97,10 @@ app.use((err, req, res, next) => { log.error(err.message); }); +// triggers sync timer require('./services/sync'); +// triggers backup timer +require('./services/backup'); + module.exports = app; \ No newline at end of file diff --git a/routes/api/tree.js b/routes/api/tree.js index 99da35c79..718cf08bc 100644 --- a/routes/api/tree.js +++ b/routes/api/tree.js @@ -4,12 +4,9 @@ const express = require('express'); const router = express.Router(); const sql = require('../../services/sql'); const utils = require('../../services/utils'); -const backup = require('../../services/backup'); const auth = require('../../services/auth'); router.get('/', auth.checkApiAuth, async (req, res, next) => { - await backup.regularBackup(); - const notes = await sql.getResults("select " + "notes_tree.*, " + "COALESCE(clone.note_title, notes.note_title) as note_title, " diff --git a/services/backup.js b/services/backup.js index d0999f8d7..3bacfa510 100644 --- a/services/backup.js +++ b/services/backup.js @@ -6,10 +6,6 @@ const fs = require('fs-extra'); const dataDir = require('./data_dir'); const log = require('./log'); -if (!fs.existsSync(dataDir.BACKUP_DIR)) { - fs.mkdirSync(dataDir.BACKUP_DIR, 0o700); -} - async function regularBackup() { const now = utils.nowTimestamp(); 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 = { - regularBackup, backupNow }; \ No newline at end of file