Skip to content
This repository was archived by the owner on Jan 14, 2025. It is now read-only.

Commit ba9b889

Browse files
authored
Configure batch size for the Monalisa sync (#102)
1 parent 7b7a480 commit ba9b889

File tree

9 files changed

+16
-14
lines changed

9 files changed

+16
-14
lines changed

app/config/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = Object.freeze({
2222
// App config
2323
winston: ResProvider.winston(),
2424
database: ResProvider.database(),
25-
syncTaskAtStart: process.env['RCT_SYNC_TASK_AT_START']?.trim().toLowerCase() === 'true' ? process.env['RCT_SYNC_TASK_AT_START'] : false,
25+
syncTaskAtStart: ResProvider.envOrDef('RCT_SYNC_TASK_AT_START', false, Boolean),
2626
databasePersistance: require('./databasePersistance.js'),
2727
public: require('./public.js'),
2828

@@ -38,5 +38,5 @@ module.exports = Object.freeze({
3838
stack: (logger, er) => logger.error(er.stack),
3939
object: (logger, er) => logger.error(JSON.stringify(er, null, 2)),
4040
},
41-
defaultErrorsLogginDepth: process.env['RCT_ERR_DEPTH']?.length() > 0 ? process.env['RCT_ERR_DEPTH'] : 'object',
41+
defaultErrorsLogginDepth: ResProvider.envOrDef('RCT_ERR_DEPTH', 'object'),
4242
});

app/config/services.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ const services = {
3131
mcDetTag: ResProvider.getServiceEndpoint('ML_MC_TAG'),
3232
},
3333
},
34+
35+
batchSize: {
36+
ML: ResProvider.envOrDef('RCT_ML_BATCH_SIZE', 2),
37+
},
3438
};
3539

3640
/*

app/lib/ResProvider.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ class ResProvider {
5959
return res;
6060
}
6161

62+
static envOrDef(name, def, castType = String) {
63+
if (castType == Boolean) {
64+
return process.env[name]?.length > 0 ? Boolean(process.env[name] == 'true') : def;
65+
}
66+
return process.env[name]?.length > 0 ? castType(process.env[name]) : def;
67+
}
68+
6269
static areDesiredValuesPresent(obj, objDefinition) {
6370
for (const key of Object.values(objDefinition)) {
6471
if (!obj[key]) {

app/lib/alimonitor-services/AbstractServiceSynchronizer.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ class AbstractServiceSynchronizer {
201201
} else {
202202
await this.makeSequentialRequest(data);
203203
}
204+
204205
this.monitor.logResults();
205206
} catch (fatalError) {
206207
this.logger.error(fatalError.stack);

app/lib/alimonitor-services/BookkeepingService.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ const EndpintFormatter = require('./ServicesEndpointsFormatter.js');
2424
class BookkeepingService extends AbstractServiceSynchronizer {
2525
constructor() {
2626
super();
27-
this.batchedRequestes = true;
2827
this.batchSize = 100;
29-
this.omitWhenCached = false;
3028

3129
this.ketpFields = {
3230
id: 'ali-bk-id',

app/lib/alimonitor-services/MonalisaService.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ const config = require('../config/configProvider.js');
2323
class MonalisaService extends AbstractServiceSynchronizer {
2424
constructor() {
2525
super();
26-
this.batchedRequestes = true;
27-
this.batchSize = 5;
28-
this.omitWhenCached = false;
26+
this.batchSize = config.services.batchSize.ML;
2927

3028
this.ketpFields = {
3129
name: 'name',
@@ -92,8 +90,6 @@ class MonalisaService extends AbstractServiceSynchronizer {
9290
const q1 = await dbClient.query(pgCommand);
9391
const q2 = await this.monalisaServiceDetails.sync(d);
9492
return Promise.all([q1, q2]);
95-
// eslint-disable-next-line capitalized-comments
96-
// return await Promise.all([dbClient.query(pgCommand), this.monalisaServiceDetails.sync(d)]);
9793
}
9894

9995
extractPeriod(rowData) {

app/lib/alimonitor-services/MonalisaServiceDetails.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ const EndpointsFormatter = require('./ServicesEndpointsFormatter.js');
2020
class MonalisaServiceDetails extends AbstractServiceSynchronizer {
2121
constructor() {
2222
super();
23-
this.batchedRequestes = true;
2423
this.batchSize = 5;
25-
this.omitWhenCached = false;
2624

2725
this.ketpFields = {
2826
run_no: 'run_number',

app/lib/alimonitor-services/MonalisaServiceMC.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ class MonalisaServiceMC extends AbstractServiceSynchronizer {
2323
constructor() {
2424
super();
2525

26-
this.batchedRequestes = true;
27-
this.batchSize = 5;
26+
this.batchSize = config.services.batchSize.ML;
2827

2928
this.ketpFields = {
3029
name: 'name',

app/lib/alimonitor-services/MonalisaServiceMCDetails.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class MonalisaServiceMCDetails extends AbstractServiceSynchronizer {
2121
constructor() {
2222
super();
2323

24-
this.batchedRequestes = true;
2524
this.batchSize = 5;
2625

2726
this.keptFields = {

0 commit comments

Comments
 (0)