From e3541e84cca5dfe94f6f8b515b970397250a5ae9 Mon Sep 17 00:00:00 2001
From: Daniel <59575049+lumijiez@users.noreply.github.com>
Date: Wed, 23 Oct 2024 19:32:03 +0300
Subject: [PATCH] fix logger stupidness

---
 src/main/java/org/lumijiez/Main.java          |  2 --
 .../java/org/lumijiez/core/tcp/TcpServer.java |  3 ++
 .../java/org/lumijiez/logging/Logger.java     | 28 +++++++++++--------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/lumijiez/Main.java b/src/main/java/org/lumijiez/Main.java
index 4608954..eccf0bb 100644
--- a/src/main/java/org/lumijiez/Main.java
+++ b/src/main/java/org/lumijiez/Main.java
@@ -5,8 +5,6 @@ import org.lumijiez.logging.Logger;
 
 public class Main {
     public static void main(String[] args) {
-        Logger logger = new Logger(Logger.LogLevel.DEBUG);
-
         HttpServer httpServer = new HttpServer(8080);
 
         httpServer.GET("/hello", (req, res) -> {
diff --git a/src/main/java/org/lumijiez/core/tcp/TcpServer.java b/src/main/java/org/lumijiez/core/tcp/TcpServer.java
index 5152670..7529b09 100644
--- a/src/main/java/org/lumijiez/core/tcp/TcpServer.java
+++ b/src/main/java/org/lumijiez/core/tcp/TcpServer.java
@@ -1,4 +1,6 @@
 package org.lumijiez.core.tcp;
+import org.lumijiez.logging.Logger;
+
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -26,6 +28,7 @@ public abstract class TcpServer {
             while (running) {
                 try {
                     Socket clientSocket = serverSocket.accept();
+
                     System.out.println("New client connected: " + clientSocket.getInetAddress());
 
                     threadPool.submit(() -> handleClient(clientSocket));
diff --git a/src/main/java/org/lumijiez/logging/Logger.java b/src/main/java/org/lumijiez/logging/Logger.java
index f615bfb..6f60205 100644
--- a/src/main/java/org/lumijiez/logging/Logger.java
+++ b/src/main/java/org/lumijiez/logging/Logger.java
@@ -10,12 +10,18 @@ public class Logger {
         DEBUG, INFO, WARN, ERROR
     }
 
+    private static final Logger instance = new Logger(LogLevel.INFO);
+
     private LogLevel currentLogLevel;
 
-    public Logger(LogLevel level) {
+    private Logger(LogLevel level) {
         this.currentLogLevel = level;
     }
 
+    public static Logger getInstance() {
+        return instance;
+    }
+
     public void log(LogLevel level, String source, String message) {
         if (level.ordinal() >= currentLogLevel.ordinal()) {
             String timestamp = LocalDateTime.now().format(formatter);
@@ -23,24 +29,24 @@ public class Logger {
         }
     }
 
-    public void debug(String source, String message) {
-        log(LogLevel.DEBUG, source, message);
+    public static void debug(String source, String message) {
+        getInstance().log(LogLevel.DEBUG, source, message);
     }
 
-    public void info(String source, String message) {
-        log(LogLevel.INFO, source, message);
+    public static void info(String source, String message) {
+        getInstance().log(LogLevel.INFO, source, message);
     }
 
-    public void warn(String source, String message) {
-        log(LogLevel.WARN, source, message);
+    public static void warn(String source, String message) {
+        getInstance().log(LogLevel.WARN, source, message);
     }
 
-    public void error(String source, String message) {
-        log(LogLevel.ERROR, source, message);
+    public static void error(String source, String message) {
+        getInstance().log(LogLevel.ERROR, source, message);
     }
 
-    public void error(String source, String message, Throwable throwable) {
-        log(LogLevel.ERROR, source, message + ": " + throwable.getMessage());
+    public static void error(String source, String message, Throwable throwable) {
+        getInstance().log(LogLevel.ERROR, source, message + ": " + throwable.getMessage());
         // throwable.printStackTrace();
     }