Merge branch 'master' into stage

DDH-RD · May 29, 2024 · 65f3d2e · 65f3d2e
2 parents d8a8f3c + cc9ec6d
commit 65f3d2e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/paladins-webservice/src/main/java/dev/luzifer/PaladinsWebservice.java b/paladins-webservice/src/main/java/dev/luzifer/PaladinsWebservice.java
@@ -33,6 +33,8 @@ public class PaladinsWebservice {
                       "Please add/change the API key in the file and restart the application");
                   return new IllegalStateException("API key is missing");
                 });
+
+    log.info("API key {} loaded successfully", API_KEY);
   }
 
   private static void ensureFileExists(Path filePath, String fileName) {

diff --git a/paladins-webservice/src/main/java/dev/luzifer/spring/controller/GlobalExceptionHandler.java b/paladins-webservice/src/main/java/dev/luzifer/spring/controller/GlobalExceptionHandler.java
@@ -5,14 +5,15 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.context.request.WebRequest;
 
 @ControllerAdvice
 @Slf4j
 public class GlobalExceptionHandler {
 
-  @ExceptionHandler(RuntimeException.class)
-  public ResponseEntity<String> handleRuntimeException(RuntimeException ex) {
-    log.error("An error occurred", ex);
-    return new ResponseEntity<>(ex.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+  @ExceptionHandler(Exception.class)
+  public ResponseEntity<?> globalExceptionHandler(Exception ex, WebRequest request) {
+    log.error("Failed request: {}", request.getDescription(false), ex);
+    return new ResponseEntity<>("Error occurred", HttpStatus.INTERNAL_SERVER_ERROR);
   }
 }