diff --git a/docker/config/application.tmpl b/docker/config/application.tmpl index dce1ac742cba1374ae5c20d827d9fad3c0f5c1cc..8d76148db2d672039af35f54a8c3223bc57aa3d8 100644 --- a/docker/config/application.tmpl +++ b/docker/config/application.tmpl @@ -50,7 +50,7 @@ frontend: logging: level: - root: {{ default .Env.LOG_LEVEL "INFO" }} + root: {{ default .Env.LOG_LEVEL "ERROR" }} org: springframework: security: ERROR diff --git a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java index 7836edf941914247a7a86d41d63108bfb33d3316..4ea52570fd3bde8c8b21253fe202aa3fc61363d4 100644 --- a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java +++ b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java @@ -274,7 +274,6 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { public void logout() { // POSTã™ã‚‹ãƒªã‚¯ã‚¨ã‚¹ãƒˆãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ãƒ¼ã‚’ä½œæˆ - Logging.LogAction("refresh token ", this.oauth2ClientContext.getAccessToken().getRefreshToken().getValue()); RestTemplate restTemplate = new RestTemplate(); MultiValueMap<String, String> formParams = new LinkedMultiValueMap<>(); formParams.add("client_id", hbp().getClientId()); @@ -284,7 +283,6 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE); // ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’ä½œæˆ - Logging.LogAction("logoutUri is ", logoutUri); RequestEntity<MultiValueMap<String, String>> requestEntity = new RequestEntity<>(formParams, httpHeaders, HttpMethod.POST, URI.create(logoutUri)); diff --git a/src/main/java/eu/hbp/mip/utils/Logging.java b/src/main/java/eu/hbp/mip/utils/Logging.java index f3ed45e83315c66b6a1714b0096dd183af13ab5e..9b75de636fc7c1721fca6dba59e2ce38cced1a7d 100644 --- a/src/main/java/eu/hbp/mip/utils/Logging.java +++ b/src/main/java/eu/hbp/mip/utils/Logging.java @@ -11,9 +11,7 @@ public class Logging { public static void LogUserAction(String userName, String endpoint, String actionInfo) { LOGGER.info(" User -> " + userName + " ," - + calculateAdditionalSpacing(userName.length(), 8) + "Endpoint -> " + endpoint + " ," - + calculateAdditionalSpacing(endpoint.length(), 32) + "Info -> " + actionInfo); } @@ -21,20 +19,6 @@ public class Logging { public static void LogExperimentAction(String experimentName, UUID experimentId, String actionInfo) { LOGGER.info(" Experiment -> " + experimentName + "(" + experimentId + ") ," - + calculateAdditionalSpacing(experimentName.length() + experimentId.toString().length() + 2, 20) + "Info -> " + actionInfo); } - - // Used when a user is not authorised yet - public static void LogAction(String actionName, String actionIdInfo) { - LOGGER.info(" Action -> " + actionName + " ," - + calculateAdditionalSpacing(actionName.length() + 2, 20) - + "Info -> " + actionIdInfo); - } - - // Calculates the spacing that is needed to create consistent logs. - private static String calculateAdditionalSpacing(Integer currentLen, Integer maxLen) { - int additionalSpacing = (maxLen > currentLen ? maxLen - currentLen + 2 : 2); - return String.format("%" + additionalSpacing + "s", ""); - } }