From c9fa49e10f24e8bb86903607962630b870565cb0 Mon Sep 17 00:00:00 2001 From: Richard Reiber Date: Fri, 4 Jun 2021 14:40:51 +0200 Subject: [PATCH] doc: updated Logger messages --- .../marvelous/server/lobby/Lobby.java | 8 +++-- .../lobby/pipelining/GameStateSegment.java | 14 +++++--- .../server/lobby/pipelining/PauseSegment.java | 36 ++++++++++++------- .../server/lobby/pipelining/Pipeline.java | 13 ++++--- .../pipelining/RequestGameStateSegment.java | 7 ++-- 5 files changed, 54 insertions(+), 24 deletions(-) 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 a9cc2a4..9df660e 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,9 +72,13 @@ public class Lobby { badRequests = 0; } - Logger.info("got {} requests from participant {}", requests.length, source); + Logger.info("{}: got {} requests from participant {}", + Thread.currentThread().getName(), + requests.length, + source); - Logger.trace("Processing requests through pipeline"); + Logger.trace("{}: Processing requests through pipeline", + Thread.currentThread().getName()); 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/GameStateSegment.java b/Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/GameStateSegment.java index f24bab4..37de070 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,15 +20,21 @@ public class GameStateSegment implements Segment { @Override public void processRequests(Packet packet, List carrier, AtomicBoolean abort) { - Logger.trace("GameStateSegment received {} requests.", packet.size()); + Logger.trace("{}: GameStateSegment received {} requests.", + Thread.currentThread().getName(), + packet.size()); var result = game.checkRequestsAndApply(packet); - Logger.trace("GameLogic generated {} events", result.map(List::size).orElse(0)); + Logger.trace("{}: GameLogic generated {} events", + Thread.currentThread().getName(), + result.map(List::size).orElse(0)); if (result.isPresent()) { - Logger.trace("Result from GameLogic is present. Adding requests to carrier."); + Logger.trace("{}: Result from GameLogic is present. Adding requests to carrier.", + Thread.currentThread().getName()); carrier.addAll(result.get()); packet.clear(); } else { - Logger.debug("Result from GameLogic is invalid. Triggering error."); + Logger.debug("{}: Result from GameLogic is invalid. Triggering error.", + Thread.currentThread().getName()); 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 eb4b8b1..cde48cc 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 @@ -22,13 +22,15 @@ public class PauseSegment implements Segment { public void pauseGame(){ if(!paused) { paused = true; - Logger.debug("Game paused."); + Logger.debug("{}: Game paused.", + Thread.currentThread().getName()); } } public void pauseEnd(){ if(paused) { paused = false; - Logger.debug("Game unpaused."); + Logger.debug("{}: Game unpaused.", + Thread.currentThread().getName()); } } @@ -55,42 +57,52 @@ public class PauseSegment implements Segment { *
  • If a mistake is made (request is sent while pause active), the client will get an error
    • *
  • If there is a PauseStopRequest the game will be unpaused
    • * - * @param packet */ @Override public void processRequests(Packet packet, List carrier, AtomicBoolean abort) { - Logger.trace("PauseSegment received {} requests. PausedState is {}", packet.size(), paused); + Logger.trace("{}: PauseSegment received {} requests. PausedState is {}", + Thread.currentThread().getName(), + 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"); + Logger.trace("{}: PauseStartRequest found", + Thread.currentThread().getName()); if (!paused) { // pause the game pauseGame(); // create a new PauseStartEvent carrier.add(new EventBuilder(EventType.PauseStartEvent).buildGameEvent()); - Logger.trace("Added PauseStartEvent to pipeline carrier"); + Logger.trace("{}: Added PauseStartEvent to pipeline carrier", + Thread.currentThread().getName()); } else { // if the game is already paused - Logger.info("PauseStartRequest sent even though the game wasn't paused. Error triggered."); + Logger.info("{}: PauseStartRequest sent even though the game wasn't paused. Error triggered.", + Thread.currentThread().getName()); abort.set(true); return; } } else if (packet.contains(new RequestBuilder(RequestType.PauseStopRequest).buildGameRequest())) { - Logger.trace("PauseStopRequest found"); + Logger.trace("{}: PauseStopRequest found", + Thread.currentThread().getName()); if (paused) { pauseEnd(); - Logger.debug("Game unpaused."); + Logger.debug("{}: Game unpaused.", + Thread.currentThread().getName()); // create a new PauseStartRequest carrier.add(new EventBuilder(EventType.PauseStopEvent).buildGameEvent()); - Logger.trace("Added PauseStopEvent to pipeline carrier"); + Logger.trace("{}: Added PauseStopEvent to pipeline carrier", + Thread.currentThread().getName()); } else { // if the game is not paused - Logger.info("PauseStopRequest sent even though the game wasn't paused. Error triggered."); + Logger.info("{}: PauseStopRequest sent even though the game wasn't paused. Error triggered.", + Thread.currentThread().getName()); abort.set(true); return; } } if (paused) { - Logger.trace("As the game is paused, Requests are removed."); + Logger.trace("{}: As the game is paused, Requests are removed.", + Thread.currentThread().getName()); 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 bd5a679..ed4a079 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,7 +38,8 @@ 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"); + Logger.trace("{}: Pipeline started RequestProcessing", + Thread.currentThread().getName()); // 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 @@ -46,7 +47,8 @@ public class Pipeline { // The abort boolean describes whether an abort happened in a segment AtomicBoolean abort = new AtomicBoolean(false); - Logger.trace("Iterating through segments"); + Logger.trace("{}: Iterating through segments", + Thread.currentThread().getName()); // Loop through all segments for (Segment segment: segments) { // Give the segment the packet, carrier and abort, and let it process requests @@ -56,10 +58,13 @@ public class Pipeline { } } if (abort.get()) { // if abort is true, return empty optional - Logger.debug("Abort triggered in Pipeline"); + Logger.debug("{}: Abort triggered in Pipeline", + Thread.currentThread().getName()); return Optional.empty(); } else { // else return an optional of the array - Logger.trace("Pipeline executed normally. Returning {} events.", carrier.size()); + Logger.trace("{}: Pipeline executed normally. Returning {} events.", + Thread.currentThread().getName(), + 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 18d5b8b..7dff0b0 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,9 +20,12 @@ public class RequestGameStateSegment implements Segment { @Override public void processRequests(Packet packet, List carrier, AtomicBoolean abort) { - Logger.trace("RequestGameStateSegment received {} requests", packet.size()); + Logger.trace("{}: RequestGameStateSegment received {} requests", + Thread.currentThread().getName(), + packet.size()); if (packet.containsRequestOfType(RequestType.Req)) { - Logger.trace("Req event found. Returning Gamestate, and clearing entire RequestList"); + Logger.trace("{}: Req event found. Returning Gamestate, and clearing entire RequestList", + Thread.currentThread().getName()); carrier.add(game.getGameStateEvent()); packet.clear(); }