Style: Use logger instead of System.out.println
This commit is contained in:
@@ -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.DisconnectEvent;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus;
|
import ch.unibas.dmi.dbis.cs108.casono.server.network.events.EventBus;
|
||||||
import ch.unibas.dmi.dbis.cs108.casono.server.network.sessions.SessionManager;
|
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. */
|
/** Application class for starting the server. */
|
||||||
public class ServerApp {
|
public class ServerApp {
|
||||||
public static void start(String arg) {
|
public static void start(String arg) {
|
||||||
int port = Integer.parseInt(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();
|
EventBus eventBus = new EventBus();
|
||||||
SessionManager sessionManager = new SessionManager();
|
SessionManager sessionManager = new SessionManager();
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ public class NetworkManager implements Runnable {
|
|||||||
|
|
||||||
/** Starts the internal thread to accept new connections. */
|
/** Starts the internal thread to accept new connections. */
|
||||||
public void start() {
|
public void start() {
|
||||||
logger.debug("Starting server at port " + port);
|
logger.debug("Starting at port {}", port);
|
||||||
thread.start();
|
thread.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ public class NetworkManager implements Runnable {
|
|||||||
* @param event the disconnect event
|
* @param event the disconnect event
|
||||||
*/
|
*/
|
||||||
public void clientDisconnected(DisconnectEvent 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. */
|
/** Runs the network manager loop, accepting connections. */
|
||||||
@@ -59,8 +59,7 @@ public class NetworkManager implements Runnable {
|
|||||||
while (running) {
|
while (running) {
|
||||||
Socket clientSocket = serverSocket.accept();
|
Socket clientSocket = serverSocket.accept();
|
||||||
|
|
||||||
System.out.println(
|
logger.debug("Accepted connection from {}", clientSocket.getRemoteSocketAddress());
|
||||||
"Accepted connection from " + clientSocket.getRemoteSocketAddress());
|
|
||||||
|
|
||||||
Session session = new Session(new TcpTransport(clientSocket), eventBus);
|
Session session = new Session(new TcpTransport(clientSocket), eventBus);
|
||||||
sessionManager.addSession(session);
|
sessionManager.addSession(session);
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ public class Session implements Runnable {
|
|||||||
public void run() {
|
public void run() {
|
||||||
while (running) {
|
while (running) {
|
||||||
try {
|
try {
|
||||||
System.out.println("Recieved: " + transport.read());
|
logger.debug("Recieved: {}", transport.read());
|
||||||
} catch (EOFException e) {
|
} catch (EOFException e) {
|
||||||
logger.info("Client disconnected");
|
logger.info("Client disconnected");
|
||||||
eventBus.publish(new DisconnectEvent(id));
|
eventBus.publish(new DisconnectEvent(id));
|
||||||
|
|||||||
-2
@@ -19,7 +19,6 @@ public class SessionManager {
|
|||||||
*/
|
*/
|
||||||
public void addSession(Session session) {
|
public void addSession(Session session) {
|
||||||
sessions.put(session.getId(), 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
|
* @return the removed session, or null if not found
|
||||||
*/
|
*/
|
||||||
public Session removeSession(SessionId id) {
|
public Session removeSession(SessionId id) {
|
||||||
System.out.println("Removed session " + id.value() + " from session manager");
|
|
||||||
return sessions.remove(id);
|
return sessions.remove(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user