summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver/src/main/java/org
diff options
context:
space:
mode:
authorSimon Rettberg2015-09-23 18:02:06 +0200
committerSimon Rettberg2015-09-23 18:02:06 +0200
commit4084af390ae8dc7f24d5a3a8bcc46146ed89fb76 (patch)
tree95520ca47e71facf6cf202f6ea3a5821f51ecc97 /dozentenmodulserver/src/main/java/org
parent[client] Disable login button while login is running; create legacy vmx if se... (diff)
downloadtutor-module-4084af390ae8dc7f24d5a3a8bcc46146ed89fb76.tar.gz
tutor-module-4084af390ae8dc7f24d5a3a8bcc46146ed89fb76.tar.xz
tutor-module-4084af390ae8dc7f24d5a3a8bcc46146ed89fb76.zip
[server] Periodically report that we're still waiting for the vm storage
Diffstat (limited to 'dozentenmodulserver/src/main/java/org')
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java2
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/FileSystem.java5
2 files changed, 6 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
index 34f0bf38..97029e55 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
@@ -166,7 +166,7 @@ public class App {
@Override
public void run() {
QuickTimer.cancel();
- LOGGER.info(new Date() + " - all Servers shut down, exiting...\n");
+ LOGGER.info("All services and workers shut down, exiting...");
}
});
}
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/FileSystem.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/FileSystem.java
index 31ea52c0..fa72056a 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/FileSystem.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/FileSystem.java
@@ -78,6 +78,7 @@ public class FileSystem {
return true;
LOGGER.warn("VM storage gone, waiting for it to reappear...");
int intrCount = 0;
+ long lastComplain = System.currentTimeMillis();
do {
try {
Thread.sleep(10000);
@@ -89,6 +90,10 @@ public class FileSystem {
return false;
}
}
+ if (System.currentTimeMillis() - lastComplain > 600000) {
+ lastComplain = System.currentTimeMillis();
+ LOGGER.warn("Still waiting for storage...");
+ }
} while (!isStorageMounted());
}
LOGGER.info("VM storage back online");