From b30b40769cb3951787fbc4561a9f7a037f932126 Mon Sep 17 00:00:00 2001
From: jomu <joern@muehlencord.de>
Date: Thu, 14 Feb 2019 17:28:41 +0100
Subject: [PATCH] improved error logging

---
 .../business/account/boundary/ApiKeyService.java   | 14 ++++++--------
 .../jeeutil/restexfw/APIExceptionInterceptor.java  |  5 +++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/account/src/main/java/de/muehlencord/shared/account/business/account/boundary/ApiKeyService.java b/account/src/main/java/de/muehlencord/shared/account/business/account/boundary/ApiKeyService.java
index d60edbb..6acbf3a 100644
--- a/account/src/main/java/de/muehlencord/shared/account/business/account/boundary/ApiKeyService.java
+++ b/account/src/main/java/de/muehlencord/shared/account/business/account/boundary/ApiKeyService.java
@@ -169,8 +169,8 @@ public class ApiKeyService implements Serializable {
             throw new JWTException("AccountControl exception");
         }
         List<ApiKeyEntity> apiKeys = getUsersApiKeys(userAccount);
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("Found {} keys for user {}", apiKeys.size(), userName);
+        if (LOGGER.isTraceEnabled()) {
+            LOGGER.trace("Found {} keys for user {}", apiKeys.size(), userName);
         }
 
         Iterator<ApiKeyEntity> it = apiKeys.iterator();
@@ -178,21 +178,20 @@ public class ApiKeyService implements Serializable {
         while (keyToLogout == null && it.hasNext()) {
             ApiKeyEntity key = it.next();
             if (key.getApiKey().equals(apiKey)) {
-                if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("Found API key in database");
+                if (LOGGER.isTraceEnabled()) {
+                    LOGGER.trace("Found API key in database");
                 }
 
                 ZonedDateTime issuedOn = ZonedDateTime.ofInstant(key.getIssuedOn().toInstant(), ZoneOffset.UTC);
                 String testString = JWTEncoder.encode(password, issuer, issuedOn, key.getAccount().getUsername(), key.getApiKey(), key.getExpiration());
-                if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("Successfully created validation JWT for user {}", userName);
+                if (LOGGER.isTraceEnabled()) {
+                    LOGGER.trace("Successfully created validation JWT for user {}", userName);
                 }
 
                 if (authorizationHeader.equals(testString)) {
                     if (LOGGER.isDebugEnabled()) {
                         LOGGER.debug("Found valid key for user {}", userName);
                     }
-
                     return key;
                 }
             }
@@ -200,7 +199,6 @@ public class ApiKeyService implements Serializable {
         if (LOGGER.isDebugEnabled()) {
             LOGGER.debug("No valid key for user {} found", userName);
         }
-
         return null;
     }
 
diff --git a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/restexfw/APIExceptionInterceptor.java b/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/restexfw/APIExceptionInterceptor.java
index 1cd0172..a117f9d 100644
--- a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/restexfw/APIExceptionInterceptor.java
+++ b/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/restexfw/APIExceptionInterceptor.java
@@ -44,9 +44,10 @@ public class APIExceptionInterceptor {
             proceedResponse = context.proceed();
         } catch (Exception ex) {
             if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug(ex.getMessage());
                 LOGGER.debug("Detailed stacktrace", new Object[]{ex});
             }
-            
+
             Response errorResponse;
             if (ex instanceof APIException) {
                 errorResponse = ((APIException) ex).getHttpResponse();
@@ -60,7 +61,7 @@ public class APIExceptionInterceptor {
                 throw (ConstraintViolationException) ex.getCause();
             } else {
                 errorResponse = new APIException(ex, locale).getHttpResponse();
-            }                        
+            }
             return errorResponse;
         }
         return proceedResponse;