Yandrik/Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

doc: removed explicit thread names from logging messages

Browse Source
This commit is contained in:
Yannik Bretschneider 2021-06-04 19:55:21 +02:00
parent e1a3e05d28
commit c3f3fc0011
6 changed files with 23 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Server/src/main/java/uulm/teamname/marvelous/server/lobby/Lobby.java
View File

@ -72,13 +72,11 @@ public class Lobby {
badRequests = 0; badRequests = 0;
} }
Logger.info("{}: got {} requests from participant {}", Logger.info("got {} requests from participant {}",
Thread.currentThread().getName(),
requests.length, requests.length,
source); source);
Logger.trace("{}: Processing requests through pipeline", Logger.trace("Processing requests through pipeline");
Thread.currentThread().getName());
Optional<Event[]> resultingEvents = pipeline.processRequests(requests, source); Optional<Event[]> resultingEvents = pipeline.processRequests(requests, source);
Logger.debug("generated {} events from the pipeline", resultingEvents.map(x -> x.length).orElse(0)); Logger.debug("generated {} events from the pipeline", resultingEvents.map(x -> x.length).orElse(0));

8
Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/DisconnectSegment.java
View File

@ -20,13 +20,9 @@ public class DisconnectSegment implements Segment {
@Override @Override
public void processRequests(Packet packet, List<Event> carrier, AtomicBoolean abort) { public void processRequests(Packet packet, List<Event> carrier, AtomicBoolean abort) {
Logger.trace("{}: DisconnectSegment received {} requests.", Logger.trace("DisconnectSegment received {} requests.", packet.size());
Thread.currentThread().getName(),
packet.size());
if (packet.containsRequestOfType(RequestType.DisconnectRequest)) { if (packet.containsRequestOfType(RequestType.DisconnectRequest)) {
Logger.debug("{}: Player of Type {} sent DisconnectRequest", Logger.debug("Player of Type {} sent DisconnectRequest", packet.getOrigin().type);
Thread.currentThread().getName(),
packet.getOrigin().type);
parent.connection.removePlayer(packet.getOrigin()); parent.connection.removePlayer(packet.getOrigin());
if (packet.getOrigin().type != ParticipantType.Spectator) { if (packet.getOrigin().type != ParticipantType.Spectator) {

14
Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/GameStateSegment.java
View File

@ -20,21 +20,15 @@ public class GameStateSegment implements Segment {
@Override @Override
public void processRequests(Packet packet, List<Event> carrier, AtomicBoolean abort) { public void processRequests(Packet packet, List<Event> carrier, AtomicBoolean abort) {
Logger.trace("{}: GameStateSegment received {} requests.", Logger.trace("GameStateSegment received {} requests.", packet.size());
Thread.currentThread().getName(),
packet.size());
var result = game.checkRequestsAndApply(packet); var result = game.checkRequestsAndApply(packet);
Logger.trace("{}: GameLogic generated {} events", Logger.trace("GameLogic generated {} events", result.map(List::size).orElse(0));
Thread.currentThread().getName(),
result.map(List::size).orElse(0));
if (result.isPresent()) { 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()); carrier.addAll(result.get());
packet.clear(); packet.clear();
} else { } 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); abort.set(true);
} }
} }

27
Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/PauseSegment.java
View File

@ -60,49 +60,40 @@ public class PauseSegment implements Segment {
*/ */
@Override @Override
public void processRequests(Packet packet, List<Event> carrier, AtomicBoolean abort) { public void processRequests(Packet packet, List<Event> carrier, AtomicBoolean abort) {
Logger.trace("{}: PauseSegment received {} requests. PausedState is {}", Logger.trace("PauseSegment received {} requests. PausedState is {}",
Thread.currentThread().getName(),
packet.size(), packet.size(),
paused); paused);
// check if there is a pause request (either start or stop) // check if there is a pause request (either start or stop)
if (packet.contains(new RequestBuilder(RequestType.PauseStartRequest).buildGameRequest())) { if (packet.contains(new RequestBuilder(RequestType.PauseStartRequest).buildGameRequest())) {
Logger.trace("{}: PauseStartRequest found", Logger.trace("PauseStartRequest found");
Thread.currentThread().getName());
if (!paused) { if (!paused) {
// pause the game // pause the game
pauseGame(); pauseGame();
// create a new PauseStartEvent // create a new PauseStartEvent
carrier.add(new EventBuilder(EventType.PauseStartEvent).buildGameEvent()); 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 } 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); abort.set(true);
return; return;
} }
} else if (packet.contains(new RequestBuilder(RequestType.PauseStopRequest).buildGameRequest())) { } else if (packet.contains(new RequestBuilder(RequestType.PauseStopRequest).buildGameRequest())) {
Logger.trace("{}: PauseStopRequest found", Logger.trace("PauseStopRequest found");
Thread.currentThread().getName());
if (paused) { if (paused) {
pauseEnd(); pauseEnd();
Logger.debug("{}: Game unpaused.", Logger.debug("Game unpaused.");
Thread.currentThread().getName());
// create a new PauseStartRequest // create a new PauseStartRequest
carrier.add(new EventBuilder(EventType.PauseStopEvent).buildGameEvent()); 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 } 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); abort.set(true);
return; return;
} }
} }
if (paused) { 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( packet.removeRequestsOfTypes(
RequestType.MeleeAttackRequest, RequestType.MeleeAttackRequest,
RequestType.RangedAttackRequest, RequestType.RangedAttackRequest,

13
Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/Pipeline.java
View File

@ -38,8 +38,7 @@ public class Pipeline {
* {@link Optional#isEmpty()} or {@link Optional#isPresent()}, and act accordingly. * {@link Optional#isEmpty()} or {@link Optional#isPresent()}, and act accordingly.
*/ */
public Optional<Event[]> processRequests(Request[] requests, Participant origin) { public Optional<Event[]> 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 // The packet carries the requests, and gets smaller per segment
Packet packet = new Packet(requests, origin); Packet packet = new Packet(requests, origin);
// The packet is filled by the requests resulting from events per segment // 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 // The abort boolean describes whether an abort happened in a segment
AtomicBoolean abort = new AtomicBoolean(false); AtomicBoolean abort = new AtomicBoolean(false);
Logger.trace("{}: Iterating through segments", Logger.trace("Iterating through segments");
Thread.currentThread().getName());
// Loop through all segments // Loop through all segments
for (Segment segment: segments) { for (Segment segment: segments) {
// Give the segment the packet, carrier and abort, and let it process requests // 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 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(); return Optional.empty();
} else { // else return an optional of the array } else { // else return an optional of the array
Logger.trace("{}: Pipeline executed normally. Returning {} events.", Logger.trace("Pipeline executed normally. Returning {} events.", carrier.size());
Thread.currentThread().getName(),
carrier.size());
return Optional.of(carrier.toArray(new Event[0])); return Optional.of(carrier.toArray(new Event[0]));
} }
} }

7
Server/src/main/java/uulm/teamname/marvelous/server/lobby/pipelining/RequestGameStateSegment.java
View File

@ -20,12 +20,9 @@ public class RequestGameStateSegment implements Segment {
@Override @Override
public void processRequests(Packet packet, List<Event> carrier, AtomicBoolean abort) { public void processRequests(Packet packet, List<Event> carrier, AtomicBoolean abort) {
Logger.trace("{}: RequestGameStateSegment received {} requests", Logger.trace("RequestGameStateSegment received {} requests", packet.size());
Thread.currentThread().getName(),
packet.size());
if (packet.containsRequestOfType(RequestType.Req)) { 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()); carrier.add(game.getGameStateEvent());
packet.clear(); packet.clear();
} }