diff options
| author | Simon Rettberg | 2016-02-24 17:55:02 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-02-24 17:55:02 +0100 |
| commit | 8d273c81cff2b3600e3b118a72aacbad113f581e (patch) | |
| tree | 9c47758d5449b2cd36e65684dd75ed7fe9d6ca1e /dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | |
| parent | [server] Log if an upload is aborted due to lack of disk space (diff) | |
| download | tutor-module-8d273c81cff2b3600e3b118a72aacbad113f581e.tar.gz tutor-module-8d273c81cff2b3600e3b118a72aacbad113f581e.tar.xz tutor-module-8d273c81cff2b3600e3b118a72aacbad113f581e.zip | |
[server] Log delete actions on images
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java index 3244ac95..0ea9921d 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java @@ -29,6 +29,7 @@ import org.openslx.bwlp.sat.thrift.cache.OperatingSystemList; import org.openslx.bwlp.sat.thrift.cache.OrganizationList; import org.openslx.bwlp.sat.thrift.cache.VirtualizerList; import org.openslx.bwlp.sat.util.FileSystem; +import org.openslx.bwlp.sat.util.Formatter; import org.openslx.bwlp.sat.util.Sanitizer; import org.openslx.bwlp.sat.util.Util; import org.openslx.bwlp.thrift.iface.AuthorizationError; @@ -358,8 +359,13 @@ public class ServerHandler implements SatelliteServer.Iface { throw new TInvocationException(InvocationError.INTERNAL_SERVER_ERROR, "VM storage not mounted"); User.canDeleteImageVersionOrFail(user, imageVersionId); try { + ImageSummaryRead imageSummary = DbImage.getImageSummary(user, + DbImage.getBaseIdForVersionId(imageVersionId)); DbImage.markForDeletion(imageVersionId); DbImage.setDeletion(DeleteState.WANT_DELETE, imageVersionId); + LOGGER.info(Formatter.userFullName(user) + " (" + user.userId + ") deleted Version " + + imageVersionId + " of " + imageSummary.imageName + " (" + imageSummary.imageBaseId + + ")"); } catch (SQLException e) { throw new TInvocationException(); } @@ -393,6 +399,9 @@ public class ServerHandler implements SatelliteServer.Iface { } DeleteOldImages.hardDeleteImages(); } + LOGGER.info(Formatter.userFullName(user) + " (" + user.userId + ") deleted Image " + + imageDetails.imageName + " (" + imageDetails.imageBaseId + ") with all its versions (" + + index + ")"); try { DbImage.deleteBasePermanently(imageBaseId); } catch (SQLException e) { |