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

Merge remote-tracking branch 'origin/rel-1.5-uzh' into development

Browse source
This commit is contained in:
anhefti 2023-06-05 13:45:01 +02:00
commit 3908d2fca9
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/SEBClientConfig.java
View file

@ -506,13 +506,13 @@ public final class SEBClientConfig implements GrantEntity, Activatable {
this.lastUpdateUser); this.lastUpdateUser);
} }
public static SEBClientConfig createNew(final Long institutionId) { public static SEBClientConfig createNew(final Long institutionId, final long pingIterval) {
return new SEBClientConfig( return new SEBClientConfig(
null, null,
institutionId, institutionId,
null, null,
ConfigPurpose.CONFIGURE_CLIENT, ConfigPurpose.CONFIGURE_CLIENT,
1000L, pingIterval,
VDIType.NO, VDIType.NO,
null, null,
null, null,

8
src/main/java/ch/ethz/seb/sebserver/gui/content/configs/SEBClientConfigForm.java
View file

@ -150,12 +150,14 @@ public class SEBClientConfigForm implements TemplateComposer {
private final DownloadService downloadService; private final DownloadService downloadService;
private final String downloadFileName; private final String downloadFileName;
private final Cryptor cryptor; private final Cryptor cryptor;
private final long defaultSEBPingInterval;
protected SEBClientConfigForm( protected SEBClientConfigForm(
final PageService pageService, final PageService pageService,
final DownloadService downloadService, final DownloadService downloadService,
final Cryptor cryptor, final Cryptor cryptor,
@Value("${sebserver.gui.seb.client.config.download.filename}") final String downloadFileName) { @Value("${sebserver.gui.seb.client.config.download.filename}") final String downloadFileName,
@Value("${sebserver.gui.seb.client.config.ping.interval:1000}") final long defaultSEBPingInterval) {
this.pageService = pageService; this.pageService = pageService;
this.restService = pageService.getRestService(); this.restService = pageService.getRestService();
@ -163,6 +165,7 @@ public class SEBClientConfigForm implements TemplateComposer {
this.currentUser = pageService.getCurrentUser(); this.currentUser = pageService.getCurrentUser();
this.downloadService = downloadService; this.downloadService = downloadService;
this.downloadFileName = downloadFileName; this.downloadFileName = downloadFileName;
this.defaultSEBPingInterval = defaultSEBPingInterval;
} }
@Override @Override
@ -179,7 +182,8 @@ public class SEBClientConfigForm implements TemplateComposer {
final SEBClientConfig clientConfig = (isNew) final SEBClientConfig clientConfig = (isNew)
? SEBClientConfig.createNew((parentEntityKey != null) ? SEBClientConfig.createNew((parentEntityKey != null)
? Long.valueOf(parentEntityKey.modelId) ? Long.valueOf(parentEntityKey.modelId)
: user.institutionId) : user.institutionId,
this.defaultSEBPingInterval)
: this.restService : this.restService
.getBuilder(GetClientConfig.class) .getBuilder(GetClientConfig.class)
.withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId) .withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId)

4
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientEventBatchService.java
View file

@ -102,6 +102,10 @@ public class SEBClientEventBatchService {
log.warn("-----> There are more then 1000 SEB client logs in the waiting queue: {}", size); log.warn("-----> There are more then 1000 SEB client logs in the waiting queue: {}", size);
} }
if (size == 0) {
return;
}
try { try {
this.events.clear(); this.events.clear();