src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java

@@ -4,13 +4,16 @@ import ch.unibas.dmi.dbis.cs108.casono.server.network.NetworkManager;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.events.DisconnectEvent;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionManager;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /** Application class for starting the server. */
 public class ServerApp {
     public static void start(String arg) {
         int port = Integer.parseInt(arg);
-        System.out.println(
-                "You've selected the server. It will accept connections at port " + port);
+
+        Logger logger = LogManager.getLogger(ServerApp.class);
+        logger.info("Starting server at port {}", port);
 
         EventBus eventBus = new EventBus();
         SessionManager sessionManager = new SessionManager();

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/NetworkManager.java

@@ -39,7 +39,7 @@ public class NetworkManager implements Runnable {
 
     /** Starts the internal thread to accept new connections. */
     public void start() {
-        logger.debug("Starting server at port " + port);
+        logger.debug("Starting at port {}", port);
         thread.start();
     }
 
@@ -49,7 +49,7 @@ public class NetworkManager implements Runnable {
      * @param event the disconnect event
      */
     public void clientDisconnected(DisconnectEvent event) {
-        logger.info("Session " + event.sessionId().value() + " disconnected adhasghd");
+        logger.info("Session {} disconnected", event.sessionId().value());
     }
 
     /** Runs the network manager loop, accepting connections. */
@@ -59,8 +59,7 @@ public class NetworkManager implements Runnable {
             while (running) {
                 Socket clientSocket = serverSocket.accept();
 
-                System.out.println(
-                        "Accepted connection from " + clientSocket.getRemoteSocketAddress());
+                logger.debug("Accepted connection from {}", clientSocket.getRemoteSocketAddress());
 
                 Session session = new Session(new TcpTransport(clientSocket), eventBus);
                 sessionManager.addSession(session);

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/Session.java

@@ -64,7 +64,7 @@ public class Session implements Runnable {
     public void run() {
         while (running) {
             try {
-                System.out.println("Recieved: " + transport.read());
+                logger.debug("Recieved: {}", transport.read());
             } catch (EOFException e) {
                 logger.info("Client disconnected");
                 eventBus.publish(new DisconnectEvent(id));

src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/sessions/SessionManager.java

@@ -19,7 +19,6 @@ public class SessionManager {
      */
     public void addSession(Session session) {
         sessions.put(session.getId(), session);
-        System.out.println("Added session " + session.getId().value() + " to session manager");
     }
 
     /**
@@ -29,7 +28,6 @@ public class SessionManager {
      * @return the removed session, or null if not found
      */
     public Session removeSession(SessionId id) {
-        System.out.println("Removed session " + id.value() + " from session manager");
         return sessions.remove(id);
     }