diff --git a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/Lobby.java b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/Lobby.java index 9df660e..ca7fc87 100644 --- a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/Lobby.java +++ b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/Lobby.java @@ -72,13 +72,11 @@ public class Lobby { badRequests = 0; } - Logger.info("{}: got {} requests from participant {}", - Thread.currentThread().getName(), + Logger.info("got {} requests from participant {}", requests.length, source); - Logger.trace("{}: Processing requests through pipeline", - Thread.currentThread().getName()); + Logger.trace("Processing requests through pipeline"); Optional resultingEvents = pipeline.processRequests(requests, source); Logger.debug("generated {} events from the pipeline", resultingEvents.map(x -> x.length).orElse(0)); diff --git a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/DisconnectSegment.java b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/DisconnectSegment.java index f1ac2ab..9a507f9 100644 --- a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/DisconnectSegment.java +++ b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/DisconnectSegment.java @@ -20,13 +20,9 @@ public class DisconnectSegment implements Segment { @Override public void processRequests(Packet packet, List carrier, AtomicBoolean abort) { - Logger.trace("{}: DisconnectSegment received {} requests.", - Thread.currentThread().getName(), - packet.size()); + Logger.trace("DisconnectSegment received {} requests.", packet.size()); if (packet.containsRequestOfType(RequestType.DisconnectRequest)) { - Logger.debug("{}: Player of Type {} sent DisconnectRequest", - Thread.currentThread().getName(), - packet.getOrigin().type); + Logger.debug("Player of Type {} sent DisconnectRequest", packet.getOrigin().type); parent.connection.removePlayer(packet.getOrigin()); if (packet.getOrigin().type != ParticipantType.Spectator) { diff --git a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/GameStateSegment.java b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/GameStateSegment.java index 37de070..f24bab4 100644 --- a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/GameStateSegment.java +++ b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/GameStateSegment.java @@ -20,21 +20,15 @@ public class GameStateSegment implements Segment { @Override public void processRequests(Packet packet, List carrier, AtomicBoolean abort) { - Logger.trace("{}: GameStateSegment received {} requests.", - Thread.currentThread().getName(), - packet.size()); + Logger.trace("GameStateSegment received {} requests.", packet.size()); var result = game.checkRequestsAndApply(packet); - Logger.trace("{}: GameLogic generated {} events", - Thread.currentThread().getName(), - result.map(List::size).orElse(0)); + Logger.trace("GameLogic generated {} events", result.map(List::size).orElse(0)); if (result.isPresent()) { - Logger.trace("{}: Result from GameLogic is present. Adding requests to carrier.", - Thread.currentThread().getName()); + Logger.trace("Result from GameLogic is present. Adding requests to carrier."); carrier.addAll(result.get()); packet.clear(); } else { - Logger.debug("{}: Result from GameLogic is invalid. Triggering error.", - Thread.currentThread().getName()); + Logger.debug("Result from GameLogic is invalid. Triggering error."); abort.set(true); } } diff --git a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/PauseSegment.java b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/PauseSegment.java index cde48cc..01c4c9a 100644 --- a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/PauseSegment.java +++ b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/PauseSegment.java @@ -60,49 +60,40 @@ public class PauseSegment implements Segment { */ @Override public void processRequests(Packet packet, List carrier, AtomicBoolean abort) { - Logger.trace("{}: PauseSegment received {} requests. PausedState is {}", - Thread.currentThread().getName(), + Logger.trace("PauseSegment received {} requests. PausedState is {}", packet.size(), paused); // check if there is a pause request (either start or stop) if (packet.contains(new RequestBuilder(RequestType.PauseStartRequest).buildGameRequest())) { - Logger.trace("{}: PauseStartRequest found", - Thread.currentThread().getName()); + Logger.trace("PauseStartRequest found"); if (!paused) { // pause the game pauseGame(); // create a new PauseStartEvent carrier.add(new EventBuilder(EventType.PauseStartEvent).buildGameEvent()); - Logger.trace("{}: Added PauseStartEvent to pipeline carrier", - Thread.currentThread().getName()); + Logger.trace("Added PauseStartEvent to pipeline carrier"); } else { // if the game is already paused - Logger.info("{}: PauseStartRequest sent even though the game wasn't paused. Error triggered.", - Thread.currentThread().getName()); + Logger.info("PauseStartRequest sent even though the game wasn't paused. Error triggered."); abort.set(true); return; } } else if (packet.contains(new RequestBuilder(RequestType.PauseStopRequest).buildGameRequest())) { - Logger.trace("{}: PauseStopRequest found", - Thread.currentThread().getName()); + Logger.trace("PauseStopRequest found"); if (paused) { pauseEnd(); - Logger.debug("{}: Game unpaused.", - Thread.currentThread().getName()); + Logger.debug("Game unpaused."); // create a new PauseStartRequest carrier.add(new EventBuilder(EventType.PauseStopEvent).buildGameEvent()); - Logger.trace("{}: Added PauseStopEvent to pipeline carrier", - Thread.currentThread().getName()); + Logger.trace("Added PauseStopEvent to pipeline carrier"); } else { // if the game is not paused - Logger.info("{}: PauseStopRequest sent even though the game wasn't paused. Error triggered.", - Thread.currentThread().getName()); + Logger.info("PauseStopRequest sent even though the game wasn't paused. Error triggered."); abort.set(true); return; } } if (paused) { - Logger.trace("{}: As the game is paused, Requests are removed.", - Thread.currentThread().getName()); + Logger.trace("As the game is paused, Requests are removed."); packet.removeRequestsOfTypes( RequestType.MeleeAttackRequest, RequestType.RangedAttackRequest, diff --git a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/Pipeline.java b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/Pipeline.java index ed4a079..bd5a679 100644 --- a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/Pipeline.java +++ b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/Pipeline.java @@ -38,8 +38,7 @@ public class Pipeline { * {@link Optional#isEmpty()} or {@link Optional#isPresent()}, and act accordingly. */ public Optional processRequests(Request[] requests, Participant origin) { - Logger.trace("{}: Pipeline started RequestProcessing", - Thread.currentThread().getName()); + Logger.trace("Pipeline started RequestProcessing"); // The packet carries the requests, and gets smaller per segment Packet packet = new Packet(requests, origin); // The packet is filled by the requests resulting from events per segment @@ -47,8 +46,7 @@ public class Pipeline { // The abort boolean describes whether an abort happened in a segment AtomicBoolean abort = new AtomicBoolean(false); - Logger.trace("{}: Iterating through segments", - Thread.currentThread().getName()); + Logger.trace("Iterating through segments"); // Loop through all segments for (Segment segment: segments) { // Give the segment the packet, carrier and abort, and let it process requests @@ -58,13 +56,10 @@ public class Pipeline { } } if (abort.get()) { // if abort is true, return empty optional - Logger.debug("{}: Abort triggered in Pipeline", - Thread.currentThread().getName()); + Logger.debug("Abort triggered in Pipeline"); return Optional.empty(); } else { // else return an optional of the array - Logger.trace("{}: Pipeline executed normally. Returning {} events.", - Thread.currentThread().getName(), - carrier.size()); + Logger.trace("Pipeline executed normally. Returning {} events.", carrier.size()); return Optional.of(carrier.toArray(new Event[0])); } } diff --git a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/RequestGameStateSegment.java b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/RequestGameStateSegment.java index 7dff0b0..18d5b8b 100644 --- a/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/RequestGameStateSegment.java +++ b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/RequestGameStateSegment.java @@ -20,12 +20,9 @@ public class RequestGameStateSegment implements Segment { @Override public void processRequests(Packet packet, List carrier, AtomicBoolean abort) { - Logger.trace("{}: RequestGameStateSegment received {} requests", - Thread.currentThread().getName(), - packet.size()); + Logger.trace("RequestGameStateSegment received {} requests", packet.size()); if (packet.containsRequestOfType(RequestType.Req)) { - Logger.trace("{}: Req event found. Returning Gamestate, and clearing entire RequestList", - Thread.currentThread().getName()); + Logger.trace("Req event found. Returning Gamestate, and clearing entire RequestList"); carrier.add(game.getGameStateEvent()); packet.clear(); }