Skip to content

Commit d6e7cb7

Browse files
authored
Don't log the cancellation exception. (#65)
Get a consistent implementation with respect to other calculation services.
1 parent 67ce867 commit d6e7cb7

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitWorkerService.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import java.util.function.Consumer;
4040
import java.util.stream.Collectors;
4141

42+
import static org.gridsuite.shortcircuit.server.service.NotificationService.CANCEL_MESSAGE;
4243
import static org.gridsuite.shortcircuit.server.service.NotificationService.FAIL_MESSAGE;
4344

4445
/**
@@ -213,6 +214,7 @@ private void cancelShortCircuitAnalysisAsync(ShortCircuitCancelContext cancelCon
213214
private void cleanShortCircuitAnalysisResultsAndPublishCancel(UUID resultUuid, String receiver) {
214215
resultRepository.delete(resultUuid);
215216
notificationService.publishStop(resultUuid, receiver);
217+
LOGGER.info(CANCEL_MESSAGE + " (resultUuid='{}')", resultUuid);
216218
}
217219

218220
@Bean
@@ -251,8 +253,8 @@ public Consumer<Message<String>> consumeRun() {
251253
} catch (InterruptedException e) {
252254
Thread.currentThread().interrupt();
253255
} catch (Exception e) {
254-
LOGGER.error(FAIL_MESSAGE, e);
255256
if (!(e instanceof CancellationException)) {
257+
LOGGER.error(FAIL_MESSAGE, e);
256258
notificationService.publishFail(resultContext.getResultUuid(), resultContext.getRunContext().getReceiver(), e.getMessage(), resultContext.getRunContext().getUserId(), resultContext.getRunContext().getBusId());
257259
resultRepository.delete(resultContext.getResultUuid());
258260
}

0 commit comments

Comments
 (0)