From 6c5d8e60aec85e7293c55a6e8359289d9dc6e119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9cile=20Chemin?= Date: Mon, 11 Dec 2023 18:48:10 +0100 Subject: [PATCH] [BUG] :bug: Error should not be logged twice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cécile Chemin --- CHANGELOG.md | 2 +- .../controller/technics/SugoiAdviceController.java | 11 ++++++++--- .../sugoi/services/logging/SugoiLoggerComponent.java | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a23cdabe..1eb2816a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ - [BUG] :goal_net: Catch all LdapException when using mono connection - [REL] :rocket: release version 2.1.2 - + # 2.1.2 - [BUG] :bug: Fix max time before a connection is dropped from ldap connection pool diff --git a/sugoi-api-rest-commons-services/src/main/java/fr/insee/sugoi/commons/services/controller/technics/SugoiAdviceController.java b/sugoi-api-rest-commons-services/src/main/java/fr/insee/sugoi/commons/services/controller/technics/SugoiAdviceController.java index 0b0b33a8..b0ec8ac0 100644 --- a/sugoi-api-rest-commons-services/src/main/java/fr/insee/sugoi/commons/services/controller/technics/SugoiAdviceController.java +++ b/sugoi-api-rest-commons-services/src/main/java/fr/insee/sugoi/commons/services/controller/technics/SugoiAdviceController.java @@ -39,11 +39,16 @@ public class SugoiAdviceController { @ExceptionHandler(Exception.class) @ResponseBody public ResponseEntity exception(Exception e) { - ErrorView errorView = new ErrorView(e.getMessage()); - HttpStatus status = computeStatusFromException(e); - if (status.is5xxServerError()) { + ResponseEntity errorView = createErrorView(e); + if (errorView.getStatusCode().is5xxServerError()) { logger.error(e.getMessage(), e); } + return errorView; + } + + public ResponseEntity createErrorView(Exception e) { + ErrorView errorView = new ErrorView(e.getMessage()); + HttpStatus status = computeStatusFromException(e); return new ResponseEntity<>(errorView, status); } diff --git a/sugoi-api-rest-services/src/main/java/fr/insee/sugoi/services/logging/SugoiLoggerComponent.java b/sugoi-api-rest-services/src/main/java/fr/insee/sugoi/services/logging/SugoiLoggerComponent.java index e2718acb..67abd141 100644 --- a/sugoi-api-rest-services/src/main/java/fr/insee/sugoi/services/logging/SugoiLoggerComponent.java +++ b/sugoi-api-rest-services/src/main/java/fr/insee/sugoi/services/logging/SugoiLoggerComponent.java @@ -66,7 +66,7 @@ public Object logArroundExec(ProceedingJoinPoint pjp) throws Throwable { @AfterThrowing(pointcut = POINTCUT, throwing = "e") public void logAfterException(JoinPoint jp, Exception e) { - ResponseEntity error = sugoiAdviceController.exception(e); + ResponseEntity error = sugoiAdviceController.createErrorView(e); if (log.isInfoEnabled()) log.info( "type={} user={} requestArguments='{}' responseCode='{}' exception='{}'",