CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

Fix job mismatched logic

Browse Source
This commit is contained in:
Adam Saghy
2022-07-21 18:21:32 +02:00
committed by Arnold Gálovics
parent 2290886e8d
commit a236d7e910
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java
+3 -1
View File
@@ -188,7 +188,7 @@ public class JobRegisterServiceImpl implements JobRegisterService, ApplicationLi
final List<ScheduledJobDetail> scheduledJobDetails = this.schedularWritePlatformService final List<ScheduledJobDetail> scheduledJobDetails = this.schedularWritePlatformService
.retrieveAllJobs(fineractProperties.getNodeId()); .retrieveAllJobs(fineractProperties.getNodeId());
for (final ScheduledJobDetail jobDetail : scheduledJobDetails) { for (final ScheduledJobDetail jobDetail : scheduledJobDetails) {
if (jobDetail.isTriggerMisfired()) { if (jobDetail.isTriggerMisfired() || jobDetail.getIsMismatchedJob()) {
if (jobDetail.isActiveSchedular()) { if (jobDetail.isActiveSchedular()) {
executeJob(jobDetail, SchedulerServiceConstants.TRIGGER_TYPE_CRON); executeJob(jobDetail, SchedulerServiceConstants.TRIGGER_TYPE_CRON);
jobDetail.setIsMismatchedJob(false); jobDetail.setIsMismatchedJob(false);
@@ -240,6 +240,8 @@ public class JobRegisterServiceImpl implements JobRegisterService, ApplicationLi
if (nodeIdStored.equals(fineractProperties.getNodeId()) || nodeIdStored.equals("0")) { if (nodeIdStored.equals(fineractProperties.getNodeId()) || nodeIdStored.equals("0")) {
executeJob(scheduledJobDetail, null); executeJob(scheduledJobDetail, null);
scheduledJobDetail.setIsMismatchedJob(false);
this.schedularWritePlatformService.saveOrUpdate(scheduledJobDetail);
} else { } else {
scheduledJobDetail.setIsMismatchedJob(true); scheduledJobDetail.setIsMismatchedJob(true);
this.schedularWritePlatformService.saveOrUpdate(scheduledJobDetail); this.schedularWritePlatformService.saveOrUpdate(scheduledJobDetail);
fineract-provider/src/main/resources/db/changelog/tenant/parts/0015_add_business_date.xml
+4 -2
View File
@@ -79,6 +79,7 @@
</insert> </insert>
</changeSet> </changeSet>
<changeSet id="4" author="fineract"> <changeSet id="4" author="fineract">
<validCheckSum>8:f7e5e697680e1e81eca6566f2481b879</validCheckSum>
<insert tableName="job"> <insert tableName="job">
<column name="name" value="Increase Business Date by 1 day"/> <column name="name" value="Increase Business Date by 1 day"/>
<column name="display_name" value="Increase Business Date by 1 day"/> <column name="display_name" value="Increase Business Date by 1 day"/>
@@ -95,10 +96,11 @@
<column name="scheduler_group" valueNumeric="0"/> <column name="scheduler_group" valueNumeric="0"/>
<column name="is_misfired" valueBoolean="false"/> <column name="is_misfired" valueBoolean="false"/>
<column name="node_id" valueNumeric="1"/> <column name="node_id" valueNumeric="1"/>
<column name="is_mismatched_job" valueBoolean="true"/> <column name="is_mismatched_job" valueBoolean="false"/>
</insert> </insert>
</changeSet> </changeSet>
<changeSet id="5" author="fineract"> <changeSet id="5" author="fineract">
<validCheckSum>8:cb7f67c27941deda1e83d317bd78dabd</validCheckSum>
<insert tableName="job"> <insert tableName="job">
<column name="name" value="Increase COB Date by 1 day"/> <column name="name" value="Increase COB Date by 1 day"/>
<column name="display_name" value="Increase COB Date by 1 day"/> <column name="display_name" value="Increase COB Date by 1 day"/>
@@ -115,7 +117,7 @@
<column name="scheduler_group" valueNumeric="0"/> <column name="scheduler_group" valueNumeric="0"/>
<column name="is_misfired" valueBoolean="false"/> <column name="is_misfired" valueBoolean="false"/>
<column name="node_id" valueNumeric="1"/> <column name="node_id" valueNumeric="1"/>
<column name="is_mismatched_job" valueBoolean="true"/> <column name="is_mismatched_job" valueBoolean="false"/>
</insert> </insert>
</changeSet> </changeSet>
</databaseChangeLog> </databaseChangeLog>