byte/wirestream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix logger stupidness

Browse Source
This commit is contained in:
Daniel
2024-10-23 19:32:03 +03:00
parent 6256bc32d0
commit e3541e84cc
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/lumijiez/Main.java
View File

@@ -5,8 +5,6 @@ import org.lumijiez.logging.Logger;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
Logger logger = new Logger(Logger.LogLevel.DEBUG);
HttpServer httpServer = new HttpServer(8080); HttpServer httpServer = new HttpServer(8080);
httpServer.GET("/hello", (req, res) -> { httpServer.GET("/hello", (req, res) -> {

3
src/main/java/org/lumijiez/core/tcp/TcpServer.java
View File

@@ -1,4 +1,6 @@
package org.lumijiez.core.tcp; package org.lumijiez.core.tcp;
import org.lumijiez.logging.Logger;
import java.io.IOException; import java.io.IOException;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.net.Socket; import java.net.Socket;
@@ -26,6 +28,7 @@ public abstract class TcpServer {
while (running) { while (running) {
try { try {
Socket clientSocket = serverSocket.accept(); Socket clientSocket = serverSocket.accept();
System.out.println("New client connected: " + clientSocket.getInetAddress()); System.out.println("New client connected: " + clientSocket.getInetAddress());
threadPool.submit(() -> handleClient(clientSocket)); threadPool.submit(() -> handleClient(clientSocket));

28
src/main/java/org/lumijiez/logging/Logger.java
View File

@@ -10,12 +10,18 @@ public class Logger {
DEBUG, INFO, WARN, ERROR DEBUG, INFO, WARN, ERROR
} }
private static final Logger instance = new Logger(LogLevel.INFO);
private LogLevel currentLogLevel; private LogLevel currentLogLevel;
public Logger(LogLevel level) { private Logger(LogLevel level) {
this.currentLogLevel = level; this.currentLogLevel = level;
} }
public static Logger getInstance() {
return instance;
}
public void log(LogLevel level, String source, String message) { public void log(LogLevel level, String source, String message) {
if (level.ordinal() >= currentLogLevel.ordinal()) { if (level.ordinal() >= currentLogLevel.ordinal()) {
String timestamp = LocalDateTime.now().format(formatter); String timestamp = LocalDateTime.now().format(formatter);
@@ -23,24 +29,24 @@ public class Logger {
} }
} }
public void debug(String source, String message) { public static void debug(String source, String message) {
log(LogLevel.DEBUG, source, message); getInstance().log(LogLevel.DEBUG, source, message);
} }
public void info(String source, String message) { public static void info(String source, String message) {
log(LogLevel.INFO, source, message); getInstance().log(LogLevel.INFO, source, message);
} }
public void warn(String source, String message) { public static void warn(String source, String message) {
log(LogLevel.WARN, source, message); getInstance().log(LogLevel.WARN, source, message);
} }
public void error(String source, String message) { public static void error(String source, String message) {
log(LogLevel.ERROR, source, message); getInstance().log(LogLevel.ERROR, source, message);
} }
public void error(String source, String message, Throwable throwable) { public static void error(String source, String message, Throwable throwable) {
log(LogLevel.ERROR, source, message + ": " + throwable.getMessage()); getInstance().log(LogLevel.ERROR, source, message + ": " + throwable.getMessage());
// throwable.printStackTrace(); // throwable.printStackTrace();
} }