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

improve logging in SchedulerTriggerListener (re. FINERACT-922) (#812)

Browse Source
This commit is contained in:
Michael Vorburger ⛑️
2020-05-24 20:18:36 +01:00
committed by GitHub
parent ce570b4b33
commit 4cb9f9d3e0
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerTriggerListener.java
+19 -21
View File
@@ -37,10 +37,7 @@ public class SchedulerTriggerListener implements TriggerListener {
private final static Logger logger = LoggerFactory.getLogger(SchedulerTriggerListener.class);
private final String name = "Global trigger Listner";
private final SchedularWritePlatformService schedularService;
private final TenantDetailsService tenantDetailsService;
@Autowired
@@ -52,18 +49,16 @@ public class SchedulerTriggerListener implements TriggerListener {
@Override
public String getName() {
return this.name;
return "Fineract Global Scheduler Trigger Listener";
}
@Override
public void triggerFired(@SuppressWarnings("unused") final Trigger trigger,
@SuppressWarnings("unused") final JobExecutionContext context) {
public void triggerFired(Trigger trigger, JobExecutionContext context) {
logger.debug("triggerFired() trigger={}, context={}", trigger, context);
}
@Override
public boolean vetoJobExecution(final Trigger trigger, final JobExecutionContext context) {
final String tenantIdentifier = trigger.getJobDataMap().getString(SchedulerServiceConstants.TENANT_IDENTIFIER);
final FineractPlatformTenant tenant = this.tenantDetailsService.loadTenantById(tenantIdentifier);
ThreadLocalContextUtil.setTenant(tenant);
@@ -76,36 +71,39 @@ public class SchedulerTriggerListener implements TriggerListener {
Integer maxNumberOfRetries = ThreadLocalContextUtil.getTenant().getConnection().getMaxRetriesOnDeadlock();
Integer maxIntervalBetweenRetries = ThreadLocalContextUtil.getTenant().getConnection().getMaxIntervalBetweenRetries();
Integer numberOfRetries = 0;
boolean proceedJob = false;
boolean vetoJob = false;
while (numberOfRetries <= maxNumberOfRetries) {
try {
proceedJob = this.schedularService.processJobDetailForExecution(jobKey, triggerType);
vetoJob = this.schedularService.processJobDetailForExecution(jobKey, triggerType);
numberOfRetries = maxNumberOfRetries + 1;
} catch (Exception exception) { //Adding generic exception as it depends on JPA provider
logger.debug("Not able to acquire the lock to update job running status for JobKey: {}", jobKey);
} catch (Exception exception) { // Adding generic exception as it depends on JPA provider
logger.warn("vetoJobExecution() not able to acquire the lock to update job running status at retry {} (of {}) for JobKey: {}",
numberOfRetries, maxNumberOfRetries, jobKey, exception);
try {
Random random = new Random();
int randomNum = random.nextInt(maxIntervalBetweenRetries + 1);
Thread.sleep(1000 + (randomNum * 1000));
numberOfRetries = numberOfRetries + 1;
} catch (InterruptedException e) {
logger.error("vetoJobExecution() caught an InterruptedException", e);
}
}
}
return proceedJob;
if (vetoJob) {
logger.warn("vetoJobExecution() WILL veto the execution (returning vetoJob == true; the job's execute method will NOT be called); "
+ "maxNumberOfRetries={}, tenant={}, jobKey={}, triggerType={}, trigger={}, context={}",
maxNumberOfRetries, tenantIdentifier, jobKey, triggerType, trigger, context);
}
return vetoJob;
}
@Override
public void triggerMisfired(@SuppressWarnings("unused") final Trigger trigger) {
public void triggerMisfired(final Trigger trigger) {
logger.error("triggerMisfired() trigger={}", trigger);
}
@Override
public void triggerComplete(@SuppressWarnings("unused") final Trigger trigger,
@SuppressWarnings("unused") final JobExecutionContext context,
@SuppressWarnings("unused") final CompletedExecutionInstruction triggerInstructionCode) {
public void triggerComplete(Trigger trigger, JobExecutionContext context, CompletedExecutionInstruction triggerInstructionCode) {
logger.debug("triggerComplete() trigger={}, context={}, completedExecutionInstruction={}", trigger, context, triggerInstructionCode);
}
}