zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-445 removed synchronized SEB connection cache access

Browse source
This commit is contained in:
anhefti 2023-05-30 15:40:17 +02:00
parent 48d3e5101c
commit 9708d8610b
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java
View file

@ -378,9 +378,9 @@ public class ExamSessionServiceImpl implements ExamSessionService {
@Override @Override
public ClientConnectionDataInternal getConnectionDataInternal(final String connectionToken) { public ClientConnectionDataInternal getConnectionDataInternal(final String connectionToken) {
synchronized (ExamSessionCacheService.CLIENT_CONNECTION_CREATION_LOCK) { //synchronized (ExamSessionCacheService.CLIENT_CONNECTION_CREATION_LOCK) {
return this.examSessionCacheService.getClientConnection(connectionToken); return this.examSessionCacheService.getClientConnection(connectionToken);
} //}
} }
@Override @Override

12
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamMonitoringController.java
View file

@ -314,6 +314,8 @@ public class ExamMonitoringController {
name = API.EXAM_MONITORING_CLIENT_GROUP_FILTER, name = API.EXAM_MONITORING_CLIENT_GROUP_FILTER,
required = false) final String hiddenClientGroups) { required = false) final String hiddenClientGroups) {
final long now = Utils.getMillisecondsNow();
final Exam runningExam = checkPrivileges(institutionId, examId); final Exam runningExam = checkPrivileges(institutionId, examId);
final MonitoringSEBConnectionData monitoringSEBConnectionData = this.examSessionService final MonitoringSEBConnectionData monitoringSEBConnectionData = this.examSessionService
@ -322,21 +324,27 @@ public class ExamMonitoringController {
createMonitoringFilter(hiddenStates, hiddenClientGroups)) createMonitoringFilter(hiddenStates, hiddenClientGroups))
.getOrThrow(); .getOrThrow();
MonitoringFullPageData monitoringFullPageData;
if (this.examAdminService.isProctoringEnabled(runningExam).getOr(false)) { if (this.examAdminService.isProctoringEnabled(runningExam).getOr(false)) {
final Collection<RemoteProctoringRoom> proctoringData = this.examProcotringRoomService final Collection<RemoteProctoringRoom> proctoringData = this.examProcotringRoomService
.getProctoringCollectingRooms(examId) .getProctoringCollectingRooms(examId)
.getOrThrow(); .getOrThrow();
return new MonitoringFullPageData( monitoringFullPageData = new MonitoringFullPageData(
examId, examId,
monitoringSEBConnectionData, monitoringSEBConnectionData,
proctoringData); proctoringData);
} else { } else {
return new MonitoringFullPageData( monitoringFullPageData = new MonitoringFullPageData(
examId, examId,
monitoringSEBConnectionData, monitoringSEBConnectionData,
Collections.emptyList()); Collections.emptyList());
} }
System.out.println("%%%%%%%% --> monitoring tuck: " + (Utils.getMillisecondsNow() - now));
return monitoringFullPageData;
} }
@RequestMapping( @RequestMapping(