From 9f4082ebf077731ad52219138901b35b448b06b9 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 26 Feb 2020 09:25:00 +0100 Subject: [PATCH] [Minor] Don't log stack trace if auth token is invalid --- .../src/main/java/li/strolch/websocket/WebSocketClient.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketClient.java b/li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketClient.java index 32e4c8809..bee3f113c 100644 --- a/li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketClient.java +++ b/li.strolch.websocket/src/main/java/li/strolch/websocket/WebSocketClient.java @@ -19,6 +19,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import li.strolch.agent.api.ComponentContainer; import li.strolch.agent.api.ObserverHandler; +import li.strolch.exception.StrolchNotAuthenticatedException; import li.strolch.model.Tags; import li.strolch.privilege.model.Certificate; import li.strolch.rest.StrolchSessionHandler; @@ -162,7 +163,10 @@ public class WebSocketClient implements MessageHandler.Whole { logger.info("User " + this.certificate.getUsername() + " authenticated on WebSocket with remote IP " + this.remoteIp); } catch (Exception e) { - logger.error("Failed to authenticate user " + username, e); + if (e instanceof StrolchNotAuthenticatedException) + logger.error("Failed to authenticate user " + username + ": " + e.getMessage()); + else + logger.error("Failed to authenticate user " + username, e); close(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Invalid authentication"); return; }