public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Reports ported to ReactJS and Knex

Browse source 
Note that the interface for the custom JS code inside a report template has changed. It now offers promise-based interface and exposes knex.
This commit is contained in:
Tomas Bures 2017-07-13 13:27:03 +02:00
parent 6d95fa515e
commit d63eed9ca9
27 changed files with 649 additions and 953 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/report-processor.js
View file

@ -30,7 +30,7 @@ function startWorker(report) {
}
try {
await reports.update(report.id, fields);
await reports.updateFields(report.id, fields);
setImmediate(tryStartWorkers);
} catch (err) {
log.error('ReportProcessor', err);
@ -47,7 +47,7 @@ function startWorker(report) {
};
try {
await reports.update(report.id, fields);
await reports.updateFields(report.id, fields);
setImmediate(tryStartWorkers);
} catch (err) {
log.error('ReportProcessor', err);
@ -83,7 +83,7 @@ async function tryStartWorkers() {
log.info('ReportProcessor', 'Starting worker');
const report = reportList[0];
await report.updateFields(report.id, {state: reports.ReportState.PROCESSING});
await reports.updateFields(report.id, {state: reports.ReportState.PROCESSING});
startWorker(report);
} else {
@ -102,7 +102,7 @@ async function tryStartWorkers() {
module.exports.start = async reportId => {
if (!workers[reportId]) {
log.info('ReportProcessor', 'Scheduling report id: %s', reportId);
await reports.updateFields(reportId, { state: reports.ReportState.SCHEDULED, lastRun: null});
await reports.updateFields(reportId, { state: reports.ReportState.SCHEDULED, last_run: null});
tryStartWorkers();
} else {
log.info('ReportProcessor', 'Worker for report id: %s is already running.', reportId);
@ -124,6 +124,7 @@ module.exports.stop = async reportId => {
module.exports.init = async () => {
try {
await reports.bulkChangeState(reports.ReportState.PROCESSING, reports.ReportState.SCHEDULED);
tryStartWorkers();
} catch (err) {
log.error('ReportProcessor', err);
}