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

FINERACT-1689: Fix job mismatched logic

Browse Source
This commit is contained in:
Adam Saghy
2023-01-27 09:52:41 +01:00
parent 1808e921ba
commit 2cdf33881d
2 changed files with 2 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
+1 -3
View File
@@ -163,7 +163,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() || jobDetail.isMismatchedJob()) { if (jobDetail.isTriggerMisfired()) {
if (jobDetail.isActiveSchedular()) { if (jobDetail.isActiveSchedular()) {
executeJob(jobDetail, SchedulerServiceConstants.TRIGGER_TYPE_CRON, Collections.emptySet()); executeJob(jobDetail, SchedulerServiceConstants.TRIGGER_TYPE_CRON, Collections.emptySet());
jobDetail.setMismatchedJob(false); jobDetail.setMismatchedJob(false);
@@ -216,8 +216,6 @@ 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, jobParameterDTOSet); executeJob(scheduledJobDetail, null, jobParameterDTOSet);
scheduledJobDetail.setMismatchedJob(false);
this.schedularWritePlatformService.saveOrUpdate(scheduledJobDetail);
} else { } else {
scheduledJobDetail.setMismatchedJob(true); scheduledJobDetail.setMismatchedJob(true);
this.schedularWritePlatformService.saveOrUpdate(scheduledJobDetail); this.schedularWritePlatformService.saveOrUpdate(scheduledJobDetail);
fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedularWritePlatformServiceJpaRepositoryImpl.java
+1
View File
@@ -148,6 +148,7 @@ public class SchedularWritePlatformServiceJpaRepositoryImpl implements Schedular
isStopExecution = true; isStopExecution = true;
} else if (!isStopExecution) { } else if (!isStopExecution) {
scheduledJobDetail.setCurrentlyRunning(true); scheduledJobDetail.setCurrentlyRunning(true);
scheduledJobDetail.setMismatchedJob(false);
} }
this.scheduledJobDetailsRepository.save(scheduledJobDetail); this.scheduledJobDetailsRepository.save(scheduledJobDetail);
return isStopExecution; return isStopExecution;