summaryrefslogtreecommitdiffstats
path: root/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
diff options
context:
space:
mode:
authorSimon Rettberg2016-02-24 17:54:42 +0100
committerSimon Rettberg2016-02-24 17:54:42 +0100
commit871fab1a8be393f64a7998e6f2e31e2caea05ae9 (patch)
treeac04866c196ceb7c138049cd2af85d80a781e08d /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
parent[client] Better handling of server side errors on upload (diff)
downloadtutor-module-871fab1a8be393f64a7998e6f2e31e2caea05ae9.tar.gz
tutor-module-871fab1a8be393f64a7998e6f2e31e2caea05ae9.tar.xz
tutor-module-871fab1a8be393f64a7998e6f2e31e2caea05ae9.zip
[server] Log if an upload is aborted due to lack of disk space
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java')
-rw-r--r--dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
index 7bad59a3..92f533e8 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
@@ -489,8 +489,12 @@ public class IncomingDataTransfer extends AbstractTransfer implements HashCheckC
return null; // No more chunks, returning null tells the Downloader we're done.
}
// Check remaining disk space and abort if it's too low
- if (FileSystem.getAvailableStorageBytes() < MIN_FREE_SPACE_BYTES) {
+ long space = FileSystem.getAvailableStorageBytes();
+ if (space != -1 && space < MIN_FREE_SPACE_BYTES) {
downloader.sendErrorCode("Out of disk space");
+ LOGGER.error("Out of space: Cancelling upload of "
+ + (image == null ? "image" : image.imageName) + " by "
+ + Formatter.userFullName(owner));
cancel();
return null;
}