Merge pull request #36 from ansforge/bug/33_add_top_catcher_for_async…

…_process Bug/33 add top catcher for async process
ansforge · Jun 18, 2024 · c799ff5 · c799ff5
1 parent 7cb306d
commit c799ff5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/fr/ans/psc/pscextract/controller/ExtractionController.java b/src/main/java/fr/ans/psc/pscextract/controller/ExtractionController.java
@@ -161,8 +161,18 @@ public ResponseEntity<?> generateExtract(@RequestParam(required = false) Integer
           else {
             emailService.sendSimpleMessage("PSCEXTRACT - sécurisation échouée", null);
           }
-        } catch (IOException e) {
+        } catch (Exception e) {
           log.error("Exception raised :", e);
+          emailService.sendSimpleMessage("PSCEXTRACT - sécurisation échouée", null);
+        } catch (Error e) {
+          log.error("Exception raised :", e);
+            try {
+              log.error("Exception raised :", e);
+              emailService.sendSimpleMessage("PSCEXTRACT - sécurisation échouée", null);
+            } catch (Exception mailEx) {
+              e.addSuppressed(mailEx);
+            }
+            throw e;
         } finally {
             busy = false;
         }

diff --git a/src/main/java/fr/ans/psc/pscextract/service/TransformationService.java b/src/main/java/fr/ans/psc/pscextract/service/TransformationService.java
@@ -345,7 +345,7 @@ public File extractToCsv(ExtractionController extractionController) throws IOExc
           zos.finish();
 
         } catch (NoSuchAlgorithmException ex) {
-          throw new RuntimeException("No SHA256 digest support in the current java runtime - please fix this.",ex);
+          throw new RuntimeException("No SHA256 digest support in the current java runtime - please fix this."+ex.getMessage(),ex);
         }
 
         if (tempExtractFile.delete()) {