From 79514cb5df1d8287c7df9de24070626a2a68a1b7 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 27 Dec 2021 14:12:09 +0100 Subject: [PATCH] added logger --- src/main/java/earth/krakatao/KraSocketClient.java | 5 +++-- src/main/java/earth/krakatao/SocketClient.java | 15 +++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/earth/krakatao/KraSocketClient.java b/src/main/java/earth/krakatao/KraSocketClient.java index cdebb9e..9e6a5d7 100644 --- a/src/main/java/earth/krakatao/KraSocketClient.java +++ b/src/main/java/earth/krakatao/KraSocketClient.java @@ -11,13 +11,14 @@ import lombok.Getter; public class KraSocketClient { + @Getter + public static final Logger logger = Logger.getLogger("KraSocketClient"); + private KraSocketClientConfig kraSocketClientConfig; @Getter private final SocketClient socketClient; private KraSocketClientEventInitiater kraSocketClientEventInitiater; - public static final Logger logger = Logger.getLogger(String.valueOf(KraSocketClient.class)); - public KraSocketClient(KraSocketClientConfig kraSocketClientConfig, KraSocketClientEventInterface kraSocketClientEventInterface, KraSocketClientProtocol kraSocketClientProtocol) throws URISyntaxException { this.kraSocketClientConfig = kraSocketClientConfig; diff --git a/src/main/java/earth/krakatao/SocketClient.java b/src/main/java/earth/krakatao/SocketClient.java index 4b9d1eb..6887d32 100644 --- a/src/main/java/earth/krakatao/SocketClient.java +++ b/src/main/java/earth/krakatao/SocketClient.java @@ -5,7 +5,6 @@ import earth.krakatao.protocol.KraSocketClientProtocolMessage; import earth.krakatao.events.KraSocketClientEventInitiater; import java.net.URI; import java.nio.ByteBuffer; -import java.util.logging.Logger; import org.java_websocket.client.WebSocketClient; import org.java_websocket.handshake.ServerHandshake; @@ -17,8 +16,6 @@ public class SocketClient extends WebSocketClient { public SocketClient(URI serverUri, KraSocketClientEventInitiater kraSocketClientEventInitiater, KraSocketClientProtocol kraProtocol) { super(serverUri); - KraSocketClient.logger.info("socket client init"); - this.kraSocketClientEventInitiater = kraSocketClientEventInitiater; this.kraProtocol = kraProtocol; } @@ -32,12 +29,12 @@ public class SocketClient extends WebSocketClient { @Override public void onOpen(ServerHandshake serverHandshake) { this.kraSocketClientEventInitiater.callOnOpen(serverHandshake); - KraSocketClient.logger.info("open"); + KraSocketClient.getLogger().info("connection open"); } @Override public void onMessage(String s) { - System.out.println("message s: "+ s); + } @Override @@ -45,19 +42,17 @@ public class SocketClient extends WebSocketClient { KraSocketClientProtocolMessage kraProtocolMessage = new KraSocketClientProtocol().DecodeMessage(byteBuffer.array()); this.kraSocketClientEventInitiater.callOnMessage(kraProtocolMessage); - System.out.println("msg b:" + byteBuffer); - + KraSocketClient.getLogger().info("rec msg " + kraProtocolMessage); } @Override public void onClose(int code, String reason, boolean remote) { this.kraSocketClientEventInitiater.callOnClose(code, reason, remote); - System.out.println("close: " + code + " " +reason + " " +remote); - KraSocketClient.logger.info("close: " + code + " " +reason + " " +remote); + KraSocketClient.logger.warning("connection closed. Code: " + code + " reason: " +reason + " remote: " +remote); } @Override public void onError(Exception e) { - System.out.println("Error: " + e); + KraSocketClient.getLogger().warning("Err: " + e); } }