vodorod/parcer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: scheduler cron expressions

Browse Source
This commit is contained in:
karishmas6
2024-10-29 00:44:38 +05:30
parent ec63e8eb9f
commit ae7cfcd345
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/src/routes/storage.ts
View File

@@ -171,7 +171,7 @@ router.put('/runs/:id', requireSignIn, async (req: AuthenticatedRequest, res) =>
const runId = uuid(); const runId = uuid();
const run = await Run.create({ const run = await Run.create({
status: 'RUNNING', status: 'running',
name: recording.recording_meta.name, name: recording.recording_meta.name,
robotId: recording.id, robotId: recording.id,
robotMetaId: recording.recording_meta.id, robotMetaId: recording.recording_meta.id,
@@ -255,10 +255,17 @@ router.post('/runs/run/:id', requireSignIn, async (req: AuthenticatedRequest, re
}); });
let totalRowsExtracted = 0; let totalRowsExtracted = 0;
run.dataValues.serializableOutput['item-0'].forEach((item: any) => { let extractedScreenshotsCount = 0;
totalRowsExtracted += Object.keys(item).length; let extractedItemsCount = 0;
if (run.dataValues.binaryOutput) {
extractedScreenshotsCount = run.dataValues.binaryOutput['item-0'].length;
} }
); if (run.dataValues.serializableOutput) {
extractedItemsCount = run.dataValues.serializableOutput['item-0'].length;
}
console.log(`${extractedItemsCount} ${extractedScreenshotsCount}`)
captureServerAnalytics.capture({ captureServerAnalytics.capture({
distinctId: req.user?.id, distinctId: req.user?.id,
@@ -268,9 +275,8 @@ router.post('/runs/run/:id', requireSignIn, async (req: AuthenticatedRequest, re
user_id: req.user?.id, user_id: req.user?.id,
created_at: new Date().toISOString(), created_at: new Date().toISOString(),
status: 'success', status: 'success',
extractedItemsCount: run.dataValues.serializableOutput['item-0'].length, extractedItemsCount,
extractedRowsCount: totalRowsExtracted, extractedScreenshotsCount,
extractedScreenshotsCount: run.dataValues.binaryOutput['item-0'].length,
} }
}) })
try { try {
@@ -355,10 +361,10 @@ router.put('/schedule/:id/', requireSignIn, async (req: AuthenticatedRequest, re
switch (runEveryUnit) { switch (runEveryUnit) {
case 'MINUTES': case 'MINUTES':
cronExpression = `${startMinutes}-${endMinutes} */${runEvery} * * *`; cronExpression = `${startMinutes} */${runEvery} * * *`;
break; break;
case 'HOURS': case 'HOURS':
cronExpression = `${startMinutes} ${startHours}-${endHours} */${runEvery} * *`; cronExpression = `${startMinutes} */${runEvery} * * *`;
break; break;
case 'DAYS': case 'DAYS':
cronExpression = `${startMinutes} ${startHours} */${runEvery} * *`; cronExpression = `${startMinutes} ${startHours} */${runEvery} * *`;
@@ -367,7 +373,7 @@ router.put('/schedule/:id/', requireSignIn, async (req: AuthenticatedRequest, re
cronExpression = `${startMinutes} ${startHours} * * ${dayIndex}`; cronExpression = `${startMinutes} ${startHours} * * ${dayIndex}`;
break; break;
case 'MONTHS': case 'MONTHS':
cronExpression = `${startMinutes} ${startHours} 1-7 * *`; cronExpression = `${startMinutes} ${startHours} ${startFrom === '1' ? '1' : '1-7'} * *`;
if (startFrom !== 'SUNDAY') { if (startFrom !== 'SUNDAY') {
cronExpression += ` ${dayIndex}`; cronExpression += ` ${dayIndex}`;
} }