From 79ebd56c6f3d0721d83002e1436cb43338407406 Mon Sep 17 00:00:00 2001 From: Daniel Gerhardt <code@dgerhardt.net> Date: Sun, 11 Feb 2018 13:57:33 +0100 Subject: [PATCH] Add debugging output for Feedback --- .../services/FeedbackStorageServiceImpl.java | 17 +++++++++++++---- .../websocket/ArsnovaSocketioServerImpl.java | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/thm/arsnova/services/FeedbackStorageServiceImpl.java b/src/main/java/de/thm/arsnova/services/FeedbackStorageServiceImpl.java index 5a9c7557f..6d3b9d656 100644 --- a/src/main/java/de/thm/arsnova/services/FeedbackStorageServiceImpl.java +++ b/src/main/java/de/thm/arsnova/services/FeedbackStorageServiceImpl.java @@ -20,6 +20,8 @@ package de.thm.arsnova.services; import de.thm.arsnova.entities.Feedback; import de.thm.arsnova.entities.Room; import de.thm.arsnova.entities.UserAuthentication; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; @@ -59,6 +61,8 @@ public class FeedbackStorageServiceImpl implements FeedbackStorageService { } } + private static final Logger logger = LoggerFactory.getLogger(FeedbackStorageServiceImpl.class); + private final Map<Room, Map<UserAuthentication, FeedbackStorageObject>> data = new ConcurrentHashMap<>(); @@ -112,11 +116,16 @@ public class FeedbackStorageServiceImpl implements FeedbackStorageService { @Override @Transactional(isolation = Isolation.READ_COMMITTED) public void save(final Room room, final int value, final UserAuthentication user) { - if (data.get(room) == null) { - data.put(room, new ConcurrentHashMap<UserAuthentication, FeedbackStorageObject>()); + logger.debug("Feedback data for {} Rooms is stored", data.size()); + logger.debug("Saving feedback: Room: {}, Value: {}, User: {}", room, value, user); + Map<UserAuthentication, FeedbackStorageObject> roomData = data.get(room); + if (roomData == null) { + logger.debug("Creating new feedback container for Room: {}", room); + roomData = new ConcurrentHashMap<UserAuthentication, FeedbackStorageObject>(); + data.put(room, roomData); } - - data.get(room).put(user, new FeedbackStorageObject(value, user)); + logger.debug("Feedback values for Room {}: {}", room.getId(), roomData.size()); + roomData.put(user, new FeedbackStorageObject(value, user)); } @Override diff --git a/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java b/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java index ca4d13d05..7ac720d84 100644 --- a/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java +++ b/src/main/java/de/thm/arsnova/websocket/ArsnovaSocketioServerImpl.java @@ -147,9 +147,9 @@ public class ArsnovaSocketioServerImpl implements ArsnovaSocketioServer, Arsnova final de.thm.arsnova.entities.Room room = roomService.getInternal(roomId, u); if (room.getSettings().isFeedbackLocked()) { - logger.debug("Feedback save blocked: {}", u, roomId, data.getValue()); + logger.debug("Feedback ignored: User: {}, Room Id: {}, Feedback: {}", u, roomId, data.getValue()); } else { - logger.debug("Feedback recieved: {}", u, roomId, data.getValue()); + logger.debug("Feedback received: User: {}, Room Id: {}, Feedback: {}", u, roomId, data.getValue()); if (null != roomId) { feedbackService.save(roomId, data.getValue(), u); } -- GitLab