From 1833ac224deaec78bb876aff02d26b800e1432f5 Mon Sep 17 00:00:00 2001 From: Quazgar <quazgar@posteo.de> Date: Thu, 30 Apr 2020 09:56:08 +0000 Subject: [PATCH] ENH: Less verbose login failure logging. For #88 --- .../server/resource/AuthenticationResource.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/caosdb/server/resource/AuthenticationResource.java b/src/main/java/caosdb/server/resource/AuthenticationResource.java index 11643907..d3b49580 100644 --- a/src/main/java/caosdb/server/resource/AuthenticationResource.java +++ b/src/main/java/caosdb/server/resource/AuthenticationResource.java @@ -23,6 +23,7 @@ package caosdb.server.resource; import caosdb.server.CaosDBException; +import caosdb.server.CaosDBServer; import caosdb.server.accessControl.AuthenticationUtils; import caosdb.server.accessControl.RealmUsernamePasswordToken; import caosdb.server.accessControl.UserSources; @@ -108,12 +109,14 @@ public class AuthenticationResource extends AbstractCaosDBServerResource { } return success(null); - } catch (final CredentialsException e) { - getLogger().log(Level.INFO, "LOGIN_FAILED", e); - } catch (final AccountException e) { + } catch (final CredentialsException | AccountException e) { getLogger().log(Level.INFO, "LOGIN_FAILED", e); } catch (final AuthenticationException e) { - getLogger().log(Level.INFO, "LOGIN_FAILED", e); + if (CaosDBServer.isDebugMode()) { + getLogger().log(Level.INFO, "LOGIN_FAILED", e); + } else { + getLogger().log(Level.INFO, "LOGIN_FAILED\t" + e.getMessage()); + } } } -- GitLab