sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed backup to simple scheme with one daily, one weekly and one monthly backup, fixes #15

pull/255/head
azivner 2018-07-30 16:40:50 +07:00
parent 263ac299d0
commit d3d49923b1
6 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
bin/push-docker-image.sh
Unescape Escape View File

9
db/migrations/0108__new_backup_options.sql
Unescape Escape View File

@ -0,0 +1,9 @@
UPDATE options SET name = 'lastDailyBackupDate' WHERE name = 'lastBackupDate';
INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
VALUES ('lastWeeklyBackupDate', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
VALUES ('lastMonthlyBackupDate', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
-- these options are not synced so no need to fix sync rows

2
src/services/app_info.js
Unescape Escape View File

@ -3,7 +3,7 @@
const build = require('./build');
const packageJson = require('../../package');
const APP_DB_VERSION = 107;
const APP_DB_VERSION = 108;
const SYNC_VERSION = 1;
module.exports = {

45
src/services/backup.js
Unescape Escape View File

@ -10,49 +10,32 @@ const syncMutexService = require('./sync_mutex');
const cls = require('./cls');
async function regularBackup() {
await periodBackup('lastDailyBackupDate', 'daily', 24 * 3600);
await periodBackup('lastWeeklyBackupDate', 'weekly', 7 * 24 * 3600);
await periodBackup('lastMonthlyBackupDate', 'monthly', 30 * 24 * 3600);
}
async function periodBackup(optionName, fileName, periodInSeconds) {
const now = new Date();
const lastBackupDate = dateUtils.parseDateTime(await optionService.getOption('lastBackupDate'));
const lastDailyBackupDate = dateUtils.parseDateTime(await optionService.getOption(optionName));
console.log(lastBackupDate);
if (now.getTime() - lastDailyBackupDate.getTime() > periodInSeconds * 1000) {
await backupNow(fileName);
if (now.getTime() - lastBackupDate.getTime() > 43200 * 1000) {
await backupNow();
await optionService.setOption(optionName, dateUtils.nowDate());
}
await cleanupOldBackups();
}
async function backupNow() {
async function backupNow(name) {
// we don't want to backup DB in the middle of sync with potentially inconsistent DB state
await syncMutexService.doExclusively(async () => {
const backupFile = dataDir.BACKUP_DIR + "/" + "backup-" + dateUtils.getDateTimeForFile() + ".db";
const backupFile = `${dataDir.BACKUP_DIR}/backup-${name}.db`;
fs.copySync(dataDir.DOCUMENT_PATH, backupFile);
log.info("Created backup at " + backupFile);
await optionService.setOption('lastBackupDate', dateUtils.nowDate());
});
}
async function cleanupOldBackups() {
const now = new Date();
fs.readdirSync(dataDir.BACKUP_DIR).forEach(file => {
const match = file.match(/backup-([0-9 -:]+)\.db/);
if (match) {
const date_str = match[1];
const date = Date.parse(date_str);
if (now.getTime() - date.getTime() > 30 * 24 * 3600 * 1000) {
log.info("Removing old backup - " + file);
fs.unlink(dataDir.BACKUP_DIR + "/" + file);
}
}
});
}

2
src/services/migration.js
Unescape Escape View File

@ -10,7 +10,7 @@ async function migrate() {
const migrations = [];
// backup before attempting migration
await backupService.backupNow();
await backupService.backupNow("before-migration");
const currentDbVersion = parseInt(await optionService.getOption('dbVersion'));

4
src/services/options_init.js
Unescape Escape View File

@ -31,7 +31,9 @@ async function initSyncedOptions(username, password) {
async function initNotSyncedOptions(initialized, startNotePath = 'root', syncServerHost = '', syncProxy = '') {
await optionService.createOption('startNotePath', startNotePath, false);
await optionService.createOption('lastBackupDate', dateUtils.nowDate(), false);
await optionService.createOption('lastDailyBackupDate', dateUtils.nowDate(), false);
await optionService.createOption('lastWeeklyBackupDate', dateUtils.nowDate(), false);
await optionService.createOption('lastMonthlyBackupDate', dateUtils.nowDate(), false);
await optionService.createOption('dbVersion', appInfo.dbVersion, false);
await optionService.createOption('lastSyncedPull', 0, false);