Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add options for compress and run once #20

Merged
merged 3 commits into from
Mar 11, 2024
Merged

feat: add options for compress and run once #20

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa52fc7
feat: add options for compress and run once
GraceRuan Feb 9, 2024
15e17a9
fix: refactor jobs
GraceRuan Feb 27, 2024
3569419
fix: refactor jobs
GraceRuan Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ export const CRON_COMPRESS = process.env.CRON_COMPRESS ?? '*/10 * * * *';
export const CRON_BACKUP = process.env.CRON_BACKUP ?? '*/20 * * * *';
export const CRON_JANITOR = process.env.CRON_JANITOR ?? '*/10 * * * *';

export const RUN_ONCE = process.env.RUN_ONCE ?? 'false';

export const COMPRESS_ENABLED = process.env.COMPRESS_ENABLED ?? 'true';

export const LOGROTATE_DIRECTORY = process.env.LOGROTATE_DIRECTORY ?? 'logs';
export const LOGROTATE_STATUSFILE =
process.env.LOGROTATE_STATUSFILE ?? 'cron.db';
Expand Down
62 changes: 45 additions & 17 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,58 @@ async function main() {
'when launching node to enable forced garbage collection.',
);
}
const runOnce = process.env.RUN_ONCE === 'true';
const compressEnabled = process.env.COMPRESS_ENABLED === 'true';

const rotateJob = Cron(CRON_ROTATE, async () => {
const combinedJob = async () => {
// Stage 1: Rotate log
await rotateLogs(db);
runGarbageCollection();
});
const compressJob = Cron(CRON_COMPRESS, async () => {
await syncLogsDb(db);
await compress(db);
runGarbageCollection();
});
const backupJob = Cron(CRON_BACKUP, async () => {

// Stage 2: Compress files - optional
if (compressEnabled) {
await syncLogsDb(db);
await compress(db);
}

// Stage 3: Backup
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will never reach stage 3 if compress disabled.

await syncLogsDb(db);
await backup(db);
runGarbageCollection();
});
const janitorJob = Cron(CRON_JANITOR, async () => {

// Stage 4: Janitor
await syncLogsDb(db);
await removeOldLogs(db);
runGarbageCollection();
});
console.log(`Rotate job next run: ${rotateJob.nextRun()}`);
console.log(`Compress job next run: ${compressJob.nextRun()}`);
console.log(`Backup job next run: ${backupJob.nextRun()}`);
console.log(`Janitor job next run: ${janitorJob.nextRun()}`);
};

if (runOnce) combinedJob();
else {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is one a function call and the other not?

const rotateJob = Cron(CRON_ROTATE, async () => {
await rotateLogs(db);
runGarbageCollection();
});

if (compressEnabled) {
const compressJob = Cron(CRON_COMPRESS, async () => {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove duplication of compress job (and other jobs) code

await syncLogsDb(db);
await compress(db);
runGarbageCollection();
});
console.log(`Compress job next run: ${compressJob.nextRun()}`);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should output after Backup job text

}
const backupJob = Cron(CRON_BACKUP, async () => {
await syncLogsDb(db);
await backup(db);
runGarbageCollection();
});
const janitorJob = Cron(CRON_JANITOR, async () => {
await syncLogsDb(db);
await removeOldLogs(db);
runGarbageCollection();
});
console.log(`Rotate job next run: ${rotateJob.nextRun()}`);
console.log(`Backup job next run: ${backupJob.nextRun()}`);
console.log(`Janitor job next run: ${janitorJob.nextRun()}`);
}
}

main();
Loading