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

fixed exam monitoring caching

Browse source
This commit is contained in:
anhefti 2019-10-17 20:09:34 +02:00
parent 2f29f14dc2
commit ce7f002d82
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -186,12 +186,11 @@ public class ExamSessionServiceImpl implements ExamSessionService {
@Override @Override
public Result<Collection<ClientConnectionData>> getConnectionData(final Long examId) { public Result<Collection<ClientConnectionData>> getConnectionData(final Long examId) {
return Result.tryCatch(() -> { return Result.tryCatch(() -> {
final Cache cache = this.cacheManager.getCache(ExamSessionCacheService.CACHE_NAME_ACTIVE_CLIENT_CONNECTION);
return this.clientConnectionDAO return this.clientConnectionDAO
.getConnectionTokens(examId) .getConnectionTokens(examId)
.getOrThrow() .getOrThrow()
.stream() .stream()
.map(token -> cache.get(token, ClientConnectionData.class)) .map(this.examSessionCacheService::getActiveClientConnection)
.filter(data -> data != null) .filter(data -> data != null)
.collect(Collectors.toList()); .collect(Collectors.toList());
}); });

2
src/main/resources/config/application-dev-ws.properties
View file

@ -22,7 +22,7 @@ spring.quartz.properties.org.quartz.threadPool.threadCount=2
sebserver.webservice.distributed=false sebserver.webservice.distributed=false
sebserver.webservice.http.scheme=http sebserver.webservice.http.scheme=http
sebserver.webservice.http.server.name=${server.address} sebserver.webservice.http.server.name=${server.address}
sebserver.webservice.http.port=${server.port} #sebserver.webservice.http.port=${server.port}
sebserver.webservice.http.redirect.gui=/gui sebserver.webservice.http.redirect.gui=/gui
sebserver.webservice.api.admin.endpoint=/admin-api/v1 sebserver.webservice.api.admin.endpoint=/admin-api/v1
sebserver.webservice.api.admin.accessTokenValiditySeconds=3600 sebserver.webservice.api.admin.accessTokenValiditySeconds=3600

2
src/test/java/ch/ethz/seb/sebserver/HTTPClientBot.java
View file

@ -88,7 +88,7 @@ public class HTTPClientBot {
this.apiVersion = args.getOrDefault("apiVersion", "v1"); this.apiVersion = args.getOrDefault("apiVersion", "v1");
this.examId = args.getOrDefault("examId", "2"); this.examId = args.getOrDefault("examId", "2");
this.institutionId = args.getOrDefault("institutionId", "1"); this.institutionId = args.getOrDefault("institutionId", "1");
this.numberOfConnections = Integer.parseInt(args.getOrDefault("numberOfConnections", "1")); this.numberOfConnections = Integer.parseInt(args.getOrDefault("numberOfConnections", "4"));
this.pingInterval = Long.parseLong(args.getOrDefault("pingInterval", "200")); this.pingInterval = Long.parseLong(args.getOrDefault("pingInterval", "200"));
this.errorInterval = Long.parseLong(args.getOrDefault("errorInterval", String.valueOf(TEN_SECONDS))); this.errorInterval = Long.parseLong(args.getOrDefault("errorInterval", String.valueOf(TEN_SECONDS)));
this.runtime = Long.parseLong(args.getOrDefault("runtime", String.valueOf(ONE_MINUTE))); this.runtime = Long.parseLong(args.getOrDefault("runtime", String.valueOf(ONE_MINUTE)));