upd: my logger

3 files changed, 10 insertions, 24 deletions

diff --git a/server/src/main/java/kz/ilotterytea/frogartha/server/FrogarthaServer.java b/server/src/main/java/kz/ilotterytea/frogartha/server/FrogarthaServer.java
index 1dbb4bd..e25dffd 100644
--- a/server/src/main/java/kz/ilotterytea/frogartha/server/FrogarthaServer.java
+++ b/server/src/main/java/kz/ilotterytea/frogartha/server/FrogarthaServer.java
@@ -3,13 +3,12 @@ package kz.ilotterytea.frogartha.server;
 import com.github.czyzby.websocket.serialization.impl.ManualSerializer;
 import kz.ilotterytea.frogartha.domain.Identity;
 import kz.ilotterytea.frogartha.exceptions.PlayerKickException;
+import kz.ilotterytea.frogartha.utils.Logger;
 import kz.ilotterytea.frogartha.utils.SerializerUtils;
 import org.java_websocket.WebSocket;
 import org.java_websocket.framing.CloseFrame;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.server.WebSocketServer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
@@ -26,7 +25,7 @@ public class FrogarthaServer extends WebSocketServer {
 
     private FrogarthaServer() {
         super(new InetSocketAddress(20015));
-        this.log = LoggerFactory.getLogger(FrogarthaServer.class);
+        this.log = new Logger(FrogarthaServer.class);
         this.players = new ArrayList<>();
 
         this.serializer = new ManualSerializer();
@@ -36,7 +35,7 @@ public class FrogarthaServer extends WebSocketServer {
     @Override
     public void onOpen(WebSocket webSocket, ClientHandshake clientHandshake) {
         PlayerConnection player = new PlayerConnection(webSocket);
-        log.info("{} ({}) connected!", player, webSocket.getRemoteSocketAddress().getAddress().getHostAddress());
+        log.log("{} ({}) connected!", player, webSocket.getRemoteSocketAddress().getAddress().getHostAddress());
         this.players.add(player);
     }
 
@@ -45,10 +44,10 @@ public class FrogarthaServer extends WebSocketServer {
         Optional<PlayerConnection> player = this.players.stream().filter((x) -> x.getConnection().equals(webSocket)).findFirst();
 
         if (player.isPresent()) {
-            log.info("{} has left! Reason: {} {}", player.get(), i, s);
+            log.log("{} has left! Reason: {} {}", player.get(), i, s);
             this.players.remove(player.get());
         } else {
-            log.info("Unknown connection was closed! Reason: {} {}", i, s);
+            log.log("Unknown connection was closed! Reason: {} {}", i, s);
         }
     }
 
@@ -94,7 +93,7 @@ public class FrogarthaServer extends WebSocketServer {
 
     @Override
     public void onStart() {
-        log.info("Running the server on port {}", getPort());
+        log.log("Running the server on port {}", getPort());
         setConnectionLostTimeout(0);
         setConnectionLostTimeout(100);
     }
@@ -103,7 +102,7 @@ public class FrogarthaServer extends WebSocketServer {
         player.send(exception);
         player.getConnection().close();
         players.remove(player);
-        log.debug("Kicked out {}! Reason: {}", player, exception.getMessage());
+        log.log("Kicked out {}! Reason: {}", player, exception.getMessage());
     }
 
     public static FrogarthaServer getInstance() {
diff --git a/server/src/main/java/kz/ilotterytea/frogartha/server/ServerHandlers.java b/server/src/main/java/kz/ilotterytea/frogartha/server/ServerHandlers.java
index 7ad2f25..b50392f 100644
--- a/server/src/main/java/kz/ilotterytea/frogartha/server/ServerHandlers.java
+++ b/server/src/main/java/kz/ilotterytea/frogartha/server/ServerHandlers.java
@@ -3,11 +3,10 @@ package kz.ilotterytea.frogartha.server;
 import kz.ilotterytea.frogartha.domain.Identity;
 import kz.ilotterytea.frogartha.domain.server.Acknowledge;
 import kz.ilotterytea.frogartha.exceptions.PlayerKickException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import kz.ilotterytea.frogartha.utils.Logger;
 
 public class ServerHandlers {
-    private static final Logger log = LoggerFactory.getLogger(ServerHandlers.class);
+    private static final Logger log = new Logger(ServerHandlers.class);
     private static final FrogarthaServer server = FrogarthaServer.getInstance();
 
     public static void handleIdentity(PlayerConnection player, Identity identity) {
@@ -21,6 +20,6 @@ public class ServerHandlers {
 
         player.setIdentity(identity);
         player.send(new Acknowledge(Acknowledge.AcknowledgeCode.IDENTIFIED));
-        log.debug("Successfully identified {} for {}", identity, player);
+        log.log("Successfully identified {} for {}", identity, player);
     }
 }
diff --git a/server/src/main/resources/logback.xml b/server/src/main/resources/logback.xml
deleted file mode 100644
index ad8b6c8..0000000
--- a/server/src/main/resources/logback.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%cyan(%d{HH:mm:ss.SSS}) %gray([%thread]) %highlight(%-5level) %magenta(%logger{36}) - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <root level="info">
-        <appender-ref ref="STDOUT"/>
-    </root>
-</configuration>