From 8c32614ac5c098e3afa73dc443aea2f8ffeb1aaa Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Wed, 6 Feb 2019 08:15:47 +0100 Subject: [PATCH] Improve WSClient and party logging - Remove duplicate logging from both WSClient and plugins listening for incoming messages - Log json instead of deserialized message on receiving message (because toString might not be properly implemented) Signed-off-by: Tomas Slusny --- .../java/net/runelite/client/plugins/party/PartyPlugin.java | 2 -- .../src/main/java/net/runelite/client/ws/PartyService.java | 2 -- .../src/main/java/net/runelite/client/ws/WSClient.java | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java index 91637e317a..edd669770c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java @@ -234,8 +234,6 @@ public class PartyPlugin extends Plugin implements KeyListener @Subscribe public void onTilePing(TilePing event) { - log.debug("Got tile ping {}", event); - if (config.pings()) { pendingTilePings.add(new PartyTilePingData(event.getPoint())); diff --git a/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java b/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java index 279be1a37c..8fbf62f387 100644 --- a/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java +++ b/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java @@ -114,7 +114,6 @@ public class PartyService @Subscribe public void onUserJoin(final UserJoin message) { - log.debug("User {} joined", message); final PartyMember partyMember = new PartyMember(message.getMemberId(), message.getName()); members.add(partyMember); @@ -130,7 +129,6 @@ public class PartyService @Subscribe public void onUserPart(final UserPart message) { - log.debug("User {} left", message); members.removeIf(member -> member.getMemberId().equals(message.getMemberId())); } diff --git a/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java b/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java index 42b61b83bd..5b92f5c533 100644 --- a/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java +++ b/runelite-client/src/main/java/net/runelite/client/ws/WSClient.java @@ -173,7 +173,7 @@ public class WSClient extends WebSocketListener implements AutoCloseable return; } - log.debug("Got message: {}", message); + log.debug("Got: {}", text); eventBus.post(message); } @@ -187,7 +187,7 @@ public class WSClient extends WebSocketListener implements AutoCloseable @Override public void onFailure(WebSocket webSocket, Throwable t, Response response) { - log.warn("Error in websocket", t); + log.warn("Error in websocket {}:{}", response, t); this.webSocket = null; } }