diff options
| author | Simon Rettberg | 2016-08-10 19:12:47 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-08-10 19:12:47 +0200 |
| commit | e50724003423ec4a60bb6de9d27365c95ddb5604 (patch) | |
| tree | d91fe89c0e445fd0bfc0e35d9f73a8ce69b76da9 /dozentenmodulserver/src | |
| parent | [server] Fix DbLog: No DELAYED for InnoDB (diff) | |
| download | tutor-module-e50724003423ec4a60bb6de9d27365c95ddb5604.tar.gz tutor-module-e50724003423ec4a60bb6de9d27365c95ddb5604.tar.xz tutor-module-e50724003423ec4a60bb6de9d27365c95ddb5604.zip | |
[server] Add/improve DbLog messages
Diffstat (limited to 'dozentenmodulserver/src')
3 files changed, 7 insertions, 4 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java index 191d0359..e445721a 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java @@ -265,7 +265,6 @@ public class DbImage { * @param user the user the image will belong to * @param imageName name of the image to be created * @return UUID of the newly created image - * @throws SQLException */ public static String createImage(UserInfo user, String imageName) throws SQLException { if (imageName.length() > 100) { 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 b330ed15..6e4ae1e0 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 @@ -259,6 +259,8 @@ public class IncomingDataTransfer extends IncomingTransferBase { versionSettings, getChunks(), machineDescription); versionWrittenToDb.set(true); } + DbLog.log(owner, image.imageBaseId, "Successfully uploaded new version " + getVersionId() + + " of VM '" + image.imageName + "'"); } catch (SQLException e) { LOGGER.error("Error finishing upload: Inserting version to DB failed", e); // Also delete uploaded file, as there is no reference to it 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 b9bc9ab4..ed38ebfa 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 @@ -287,7 +287,9 @@ public class ServerHandler implements SatelliteServer.Iface { if (!Util.isPrintable(imageName) || Util.isEmptyString(imageName)) throw new TInvocationException(InvocationError.INVALID_DATA, "Invalid or empty name"); try { - return DbImage.createImage(user, imageName); + String imageBaseId = DbImage.createImage(user, imageName); + DbLog.log(user, imageBaseId, "New Image created: '" + imageName + "'"); + return imageBaseId; } catch (SQLException e) { throw new TInvocationException(); } @@ -403,8 +405,8 @@ public class ServerHandler implements SatelliteServer.Iface { } DeleteOldImages.hardDeleteImages(); } - DbLog.log(user, null, Formatter.userFullName(user) + " deleted Image '" + imageDetails.imageName - + "' (" + imageDetails.imageBaseId + ") with all its versions (" + index + ")"); + DbLog.log(user, imageDetails.imageBaseId, Formatter.userFullName(user) + " deleted Image '" + imageDetails.imageName + + "' with all its versions (" + index + ")"); try { DbImage.deleteBasePermanently(imageBaseId); } catch (SQLException e) { |