honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add logging

This commit is contained in:
Tadgh 2020-07-03 09:40:52 -07:00
parent aa1e46fdb0
commit 38cb526696
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobCloser.java
View File

@ -22,6 +22,7 @@ package ca.uhn.fhir.jpa.bulk.job;
import ca.uhn.fhir.jpa.bulk.model.BulkJobStatusEnum;
import ca.uhn.fhir.jpa.bulk.svc.BulkExportDaoSvc;
import org.slf4j.Logger;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.StepContribution;
import org.springframework.batch.core.scope.context.ChunkContext;
@ -30,10 +31,14 @@ import org.springframework.batch.repeat.RepeatStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import static org.slf4j.LoggerFactory.getLogger;
/**
* Will run before and after a job to set the status to whatever is appropriate.
*/
public class BulkExportJobCloser implements Tasklet {
private static final Logger ourLog = getLogger(BulkExportJobCloser.class);
@Value("#{jobExecutionContext['jobUUID']}")
private String myJobUUID;
@ -44,8 +49,10 @@ public class BulkExportJobCloser implements Tasklet {
@Override
public RepeatStatus execute(StepContribution theStepContribution, ChunkContext theChunkContext) throws Exception {
if (theChunkContext.getStepContext().getStepExecution().getJobExecution().getStatus() == BatchStatus.STARTED) {
ourLog.warn("Job Closer is setting job to COMPLETE!");
myBulkExportDaoSvc.setJobToStatus(myJobUUID, BulkJobStatusEnum.COMPLETE);
} else {
ourLog.error("Job Closer is setting job to ERROR!");
myBulkExportDaoSvc.setJobToStatus(myJobUUID, BulkJobStatusEnum.ERROR);
}
return RepeatStatus.FINISHED;

2
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/BulkDataExportSvcImplR4Test.java
View File

@ -340,7 +340,9 @@ public class BulkDataExportSvcImplR4Test extends BaseJpaR4Test {
//create one itself, which means that its jobUUID isnt known until it starts. to get around this, we move
public void awaitJobCompletion(JobExecution theJobExecution) throws InterruptedException {
await().until(() -> {
ourLog.warn("Checking to see if jobExecution {} is finished", theJobExecution.getId());
JobExecution jobExecution = myJobExplorer.getJobExecution(theJobExecution.getId());
ourLog.warn("That jobExecution currently has status: {}", jobExecution.getStatus());
return jobExecution.getStatus() == BatchStatus.COMPLETED;
});
}