diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java index a9a46c7..51e022d 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java @@ -99,7 +99,7 @@ public class ServerApp { public static void start(String arg) { int port = Integer.parseInt(arg); - Logger logger = LogManager.getLogger(ServerApp.class); + Logger logger = LogManager.getLogger(ServerApp.class.getSimpleName()); logger.info("Starting server at port {}", port); EventBus eventBus = new EventBus(); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/lobby/join_lobby/JoinLobbyHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/lobby/join_lobby/JoinLobbyHandler.java index 169b027..e557c3c 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/lobby/join_lobby/JoinLobbyHandler.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/lobby/join_lobby/JoinLobbyHandler.java @@ -23,7 +23,8 @@ import org.apache.logging.log4j.Logger; public class JoinLobbyHandler extends CommandHandler { private final LobbyManager lobbyManager; private final UserRegistry userRegistry; - private static final Logger LOGGER = LogManager.getLogger(JoinLobbyHandler.class); + private static final Logger LOGGER = + LogManager.getLogger(JoinLobbyHandler.class.getSimpleName()); /** * Create a new {@link JoinLobbyHandler}. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/lobby/LobbyCleanupJob.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/lobby/LobbyCleanupJob.java index 47c0413..713993c 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/lobby/LobbyCleanupJob.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/lobby/LobbyCleanupJob.java @@ -14,7 +14,8 @@ import org.apache.logging.log4j.Logger; /** Periodically removes expired empty lobbies and notifies connected sessions. */ public class LobbyCleanupJob implements Runnable { - private static final Logger LOGGER = LogManager.getLogger(LobbyCleanupJob.class); + private static final Logger LOGGER = + LogManager.getLogger(LobbyCleanupJob.class.getSimpleName()); private final LobbyManager lobbyManager; private final SessionManager sessionManager; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserCleanupJob.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserCleanupJob.java index 32cfbb4..9b520ab 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserCleanupJob.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserCleanupJob.java @@ -15,7 +15,7 @@ public class UserCleanupJob implements Runnable { private final Duration reconnectThreshold; public UserCleanupJob(UserRegistry registry, Duration reconnectThreshold) { - this.logger = LogManager.getLogger(UserCleanupJob.class); + this.logger = LogManager.getLogger(UserCleanupJob.class.getSimpleName()); this.registry = registry; this.reconnectThreshold = reconnectThreshold; } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserFactory.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserFactory.java index 0a41b0c..30f232a 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserFactory.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/domain/user/UserFactory.java @@ -9,7 +9,7 @@ import org.apache.logging.log4j.Logger; public class UserFactory { private final UserRegistry registry; private final AtomicInteger anonymousCounter = new AtomicInteger(1); - private static final Logger LOGGER = LogManager.getLogger(UserFactory.class); + private static final Logger LOGGER = LogManager.getLogger(UserFactory.class.getSimpleName()); /** * Creates a new UserFactory backed by the given registry. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java index 83a39d3..65e3780 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java @@ -26,7 +26,7 @@ public class NetworkManager implements Runnable { */ public NetworkManager(Integer port, SessionManager sessionManager, CommandRouter router) { this.port = port; - this.logger = LogManager.getLogger(NetworkManager.class); + this.logger = LogManager.getLogger(NetworkManager.class.getSimpleName()); this.thread = new Thread(this, "networkManager"); this.running = true; this.sessionManager = sessionManager; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionDisconnectJob.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionDisconnectJob.java index 6fd481d..04e90cc 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionDisconnectJob.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionDisconnectJob.java @@ -15,7 +15,7 @@ public class SessionDisconnectJob implements Runnable { public SessionDisconnectJob( SessionManager sessionManager, EventBus eventBus, Duration timeoutThreshold) { - this.logger = LogManager.getLogger(SessionDisconnectJob.class); + this.logger = LogManager.getLogger(SessionDisconnectJob.class.getSimpleName()); this.sessionManager = sessionManager; this.eventBus = eventBus; this.timeoutThreshold = timeoutThreshold; diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java index 569b828..1797668 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java @@ -24,7 +24,7 @@ public class SessionManager { public SessionManager(EventBus eventBus, CommandParserDispatcher dispatcher) { this.sessions = new ConcurrentHashMap<>(); this.eventBus = eventBus; - this.logger = LogManager.getLogger(SessionManager.class); + this.logger = LogManager.getLogger(SessionManager.class.getSimpleName()); this.dispatcher = dispatcher; } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java index 4d5e353..585cd54 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionReader.java @@ -41,7 +41,7 @@ public class SessionReader implements Runnable { this.router = session.getRouter(); this.logger = LogManager.getLogger( - SessionReader.class.toString() + "-" + session.getId().value()); + SessionReader.class.getSimpleName() + "-" + session.getId().value()); } @Override diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionWriter.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionWriter.java index c59abb3..20c11e0 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionWriter.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionWriter.java @@ -18,7 +18,7 @@ public class SessionWriter implements Runnable { this.queue = session.getResponseQueue(); this.logger = LogManager.getLogger( - SessionReader.class.toString() + "-" + session.getId().value()); + SessionReader.class.getSimpleName() + "-" + session.getId().value()); } public void run() {