backup is now triggered after start of the app and with timer

This commit is contained in:
azivner 2017-10-28 12:23:11 -04:00
parent 94a0f3e041
commit c5f80051ae
3 changed files with 13 additions and 8 deletions

4
app.js
View File

@ -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;

View File

@ -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, "

View File

@ -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
};