Compare commits

..

No commits in common. "12eafe82ce7bd8ce1aa83ef05280069c0a051e95" and "b90cba5c710e409a7e6a93ce93e110ea7be9655d" have entirely different histories.

3 changed files with 6 additions and 22 deletions

View File

@ -3,13 +3,12 @@ const path = require('path');
const { EventEmitter } = require('events'); const { EventEmitter } = require('events');
class Archiver { class Archiver {
constructor(backupPath, backupPaths, gzip, gzipLevel) { constructor(backupPath, backupPaths) {
this.backupPath = backupPath; this.backupPath = backupPath;
this.backupPaths = backupPaths; this.backupPaths = backupPaths;
this.eventEmitter = new EventEmitter(); this.eventEmitter = new EventEmitter();
this.archive = require('archiver')('tar', { this.archive = require('archiver')('tar', {
gzip: gzip, zlib: { level: 9 }
gzipOptions: { level: gzipLevel }
}); });
this.totalFiles = 0; this.totalFiles = 0;
} }

View File

@ -96,11 +96,7 @@ const run = async (programArgs) => {
.replace("{taskName}", PATH.parse(taskName).name); .replace("{taskName}", PATH.parse(taskName).name);
const DB_FILE = PATH.join(TEMP_DIR, require('crypto').randomBytes(16).toString('hex') + ".sql"); const DB_FILE = PATH.join(TEMP_DIR, require('crypto').randomBytes(16).toString('hex') + ".sql");
const ARCHIVE = new BACKUP_ARCHIVE(PATH.join(BACKUPS_DIRECTORY, PATH.parse(taskName).name, const ARCHIVE = new BACKUP_ARCHIVE(PATH.join(BACKUPS_DIRECTORY, PATH.parse(taskName).name, REPLACED_FILENAME + ".tar.gz"), TASK_FILE_CONTENTS.filesystem.targets);
REPLACED_FILENAME + ".tar.gz"),
TASK_FILE_CONTENTS.filesystem.targets,
TASK_FILE_CONTENTS.general.gzip,
TASK_FILE_CONTENTS.general.gzipLevel);
ARCHIVE.eventEmitter.on('progress', (progressInfo) => { ARCHIVE.eventEmitter.on('progress', (progressInfo) => {
const TOTAL = ARCHIVE.totalFiles; const TOTAL = ARCHIVE.totalFiles;
@ -236,9 +232,7 @@ const run = async (programArgs) => {
const TASK_CONFIG = { const TASK_CONFIG = {
"general": { "general": {
"dateFormat": "yyyy-MM-DD HH-mm-ss", "dateFormat": "yyyy-MM-DD HH-mm-ss",
"outputFile": "{date} - {taskName}", "outputFile": "{date} - {taskName}"
"gzip": true,
"gzipLevel": 6
}, },
"vacuum": { "vacuum": {
"enabled": true, "enabled": true,
@ -300,16 +294,6 @@ const validate = (taskConfig) => {
} else { } else {
ERRORS.push("general.outputFile is not defined or is not a string"); ERRORS.push("general.outputFile is not defined or is not a string");
} }
if (typeof taskConfig.general.gzip === "boolean") {
if (taskConfig.general.gzip) {
if (!taskConfig.general.gzipLevel && typeof taskConfig.general.gzipLevel !== "number") {
ERRORS.push("general.gzipLevel is not defined or is not a number");
}
}
} else {
ERRORS.push("general.gzip is not defined or is not a boolean");
ERRORS.push("general.gzipLevel is not defined or is not a number");
}
} else { } else {
ERRORS.push("general section is missing or not an object"); ERRORS.push("general section is missing or not an object");
ERRORS.push("general.dateFormat is not defined or is not a string"); ERRORS.push("general.dateFormat is not defined or is not a string");

View File

@ -6,7 +6,8 @@ class Timer {
} }
endTimer() { endTimer() {
return prettytime(Date.now() - this.start, { decimals: 2 }); const ELAPSED = Date.now() - this.start;
return prettytime(ELAPSED, { decimals: 2 });
} }
} }