diff options
| author | Simon Rettberg | 2015-10-27 11:43:39 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2015-10-27 11:43:39 +0100 |
| commit | 35605203f7c1b8a20cae7f7f1b2a45302cafd425 (patch) | |
| tree | 25c1baa9ec269335b7fa328060ed5feb30fe21c3 | |
| parent | [client] Clean up config window, add config button to login dialog (diff) | |
| download | tutor-module-35605203f7c1b8a20cae7f7f1b2a45302cafd425.tar.gz tutor-module-35605203f7c1b8a20cae7f7f1b2a45302cafd425.tar.xz tutor-module-35605203f7c1b8a20cae7f7f1b2a45302cafd425.zip | |
[*] Implement max connection information in satellite config
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java | 7 | ||||
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java index dbc42b16..53d8f436 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/filetransfer/TransferTask.java @@ -8,6 +8,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.TransferState; +import org.openslx.dozmod.thrift.Session; import org.openslx.filetransfer.Transfer; import org.openslx.util.Util; @@ -112,6 +113,12 @@ public abstract class TransferTask implements Runnable { protected abstract TransferEvent getTransferEvent(); public final void setMinConnections(int count) { + if (Session.getSatelliteConfig() != null + && Session.getSatelliteConfig().isSetMaxConnectionsPerTransfer() + && Session.getSatelliteConfig().getMaxConnectionsPerTransfer() > 0 + && Session.getSatelliteConfig().getMaxConnectionsPerTransfer() < count) { + count = Session.getSatelliteConfig().getMaxConnectionsPerTransfer(); + } synchronized (transfers) { this.minConnectionCount = count; } diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java index 20b73549..8f050777 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/RuntimeConfig.java @@ -1,6 +1,7 @@ package org.openslx.bwlp.sat; import org.openslx.bwlp.sat.database.Paginator; +import org.openslx.bwlp.sat.util.Constants; import org.openslx.bwlp.thrift.iface.ImagePermissions; import org.openslx.bwlp.thrift.iface.LecturePermissions; import org.openslx.bwlp.thrift.iface.SatelliteConfig; @@ -17,6 +18,8 @@ public class RuntimeConfig { satConfig.setMaxImageValidityDays(200); satConfig.setMaxLectureValidityDays(200); satConfig.setPageSize(Paginator.PER_PAGE); + satConfig.setMaxConnectionsPerTransfer(Constants.MAX_CONNECTIONS_PER_TRANSFER); + satConfig.setMaxTransfers(Constants.MAX_UPLOADS / 2); } public static SatelliteConfig get() { |