Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1830: only log exception at debug if it is STOPPED

Browse Source
This commit is contained in:
Dave Syer
2012-07-25 13:21:29 +01:00
parent 96d3564247
commit 1449eb3dc3
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
View File

@@ -176,8 +176,8 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw
*/
public final void execute(StepExecution stepExecution) throws JobInterruptedException,
UnexpectedJobExecutionException {
logger.debug("Executing: id="+stepExecution.getId());
logger.debug("Executing: id=" + stepExecution.getId());
stepExecution.setStartTime(new Date());
stepExecution.setStatus(BatchStatus.STARTED);
getJobRepository().update(stepExecution);
@@ -209,15 +209,24 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw
logger.debug("Step execution success: id=" + stepExecution.getId());
}
catch (Throwable e) {
logger.error("Encountered an error executing the step", e);
stepExecution.upgradeStatus(determineBatchStatus(e));
exitStatus = exitStatus.and(getDefaultExitStatusForFailure(e));
stepExecution.addFailureException(e);
if (stepExecution.getStatus() == BatchStatus.STOPPED) {
logger.info("Encountered interruption executing step: " + e.getMessage());
if (logger.isDebugEnabled()) {
logger.debug("Full exception", e);
}
}
else {
logger.error("Encountered an error executing the step", e);
}
}
finally {
try {
// Update the step execution to the latest known value so the listeners can act on it
// Update the step execution to the latest known value so the
// listeners can act on it
exitStatus = exitStatus.and(stepExecution.getExitStatus());
stepExecution.setExitStatus(exitStatus);
exitStatus = exitStatus.and(getCompositeListener().afterStep(stepExecution));