summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
diff options
context:
space:
mode:
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index 4be287d7..8b521c9a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -592,7 +592,12 @@ public abstract class MainWindow {
try {
SatelliteStatus status = ThriftManager.getSatClient().getStatus();
failures = 0;
- remoteString = " [Store: " + FormatHelper.bytes(status.availableStorageBytes, false) + "]";
+ remoteString = " [Store: " + FormatHelper.bytes(status.availableStorageBytes, false);
+ long maxSize = Session.getSatelliteConfig().vmSizeLimit;
+ if (maxSize > 0) {
+ remoteString += ", VM-Limit: " + FormatHelper.bytes(maxSize, false);
+ }
+ remoteString += "]";
if (!timeDiffChecked) {
final long now = System.currentTimeMillis() / 1000;
final long diffSecs = Math.abs(now - status.serverTime);