self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Fixes from review.

Browse Source
This commit is contained in:
Hubert 2023-08-06 12:06:38 -03:00
parent b35782fddb
commit 446845afde
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/lib/RotatingLogs.test.ts
View File

@ -12,7 +12,7 @@ describe('RotatingLogs', () => {
try { try {
dir = await createTempDir(); dir = await createTempDir();
await createTestLogFile(dir); await createTestLogFile(dir);
let files: string[] = await readdir(dir); let files = await readdir(dir);
expect(files.find(file => file.match(/^log.txt$/gi))).toBeTruthy(); expect(files.find(file => file.match(/^log.txt$/gi))).toBeTruthy();
expect(files.length).toBe(1); expect(files.length).toBe(1);
const rotatingLogs: RotatingLogs = new RotatingLogs(dir, 1, 1); const rotatingLogs: RotatingLogs = new RotatingLogs(dir, 1, 1);
@ -35,7 +35,7 @@ describe('RotatingLogs', () => {
await rotatingLogs.cleanActiveLogFile(); await rotatingLogs.cleanActiveLogFile();
await msleep(1); await msleep(1);
await rotatingLogs.deleteNonActiveLogFiles(); await rotatingLogs.deleteNonActiveLogFiles();
const files: string[] = await readdir(dir); const files = await readdir(dir);
expect(files.find(file => file.match(/^log-[0-9]+.txt$/gi))).toBeFalsy(); expect(files.find(file => file.match(/^log-[0-9]+.txt$/gi))).toBeFalsy();
expect(files.length).toBe(0); expect(files.length).toBe(0);
} finally { } finally {
@ -52,7 +52,7 @@ describe('RotatingLogs', () => {
const rotatingLogs: RotatingLogs = new RotatingLogs(dir, 1, 100); const rotatingLogs: RotatingLogs = new RotatingLogs(dir, 1, 100);
await rotatingLogs.cleanActiveLogFile(); await rotatingLogs.cleanActiveLogFile();
await rotatingLogs.deleteNonActiveLogFiles(); await rotatingLogs.deleteNonActiveLogFiles();
const files: string[] = await readdir(dir); const files = await readdir(dir);
expect(files.find(file => file.match(/^log-[0-9]+.txt$/gi))).toBeTruthy(); expect(files.find(file => file.match(/^log-[0-9]+.txt$/gi))).toBeTruthy();
expect(files.length).toBe(1); expect(files.length).toBe(1);
} finally { } finally {

2
packages/lib/RotatingLogs.ts
View File

@ -29,7 +29,7 @@ export default class RotatingLogs {
const files: Stat[] = await this.fsDriver().readDirStats(this.logFilesDir); const files: Stat[] = await this.fsDriver().readDirStats(this.logFilesDir);
for (const file of files) { for (const file of files) {
if (!file.path.match(/^log-[0-9]+.txt$/gi)) continue; if (!file.path.match(/^log-[0-9]+.txt$/gi)) continue;
const timestamp: string = file.path.match(/[0-9]+/g)[0]; const timestamp: number = parseInt(file.path.match(/[0-9]+/g)[0], 10);
const ageOfTheFile: number = Date.now() - timestamp; const ageOfTheFile: number = Date.now() - timestamp;
if (ageOfTheFile >= this.inactiveMaxAge) { if (ageOfTheFile >= this.inactiveMaxAge) {
await this.fsDriver().remove(this.logFileFullpath(file.path)); await this.fsDriver().remove(this.logFileFullpath(file.path));