diff options
author | Jannik Schönartz | 2021-11-29 00:58:18 +0100 |
---|---|---|
committer | Jannik Schönartz | 2021-11-29 00:58:18 +0100 |
commit | 9097da596d8f58a72c115a7873794106ef34b5e0 (patch) | |
tree | dc8265bddb2b233d7b847d7b67082b51bd14155c /src/main/java | |
parent | Add script for downloading/merging the edited image (diff) | |
download | tmlite-bwlp-remote-edit-vm.tar.gz tmlite-bwlp-remote-edit-vm.tar.xz tmlite-bwlp-remote-edit-vm.zip |
Rework snapshot task to work with edit id, add file deletion on the client (because runvirt doesn't have enough permission) and add lecture mysql update, to use the new merged versionremote-edit-vm
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/openslx/taskmanager/tasks/ScpSnapshot.java | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/main/java/org/openslx/taskmanager/tasks/ScpSnapshot.java b/src/main/java/org/openslx/taskmanager/tasks/ScpSnapshot.java index 0fe0c24..9fef1a9 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/ScpSnapshot.java +++ b/src/main/java/org/openslx/taskmanager/tasks/ScpSnapshot.java @@ -10,13 +10,11 @@ import com.google.gson.annotations.Expose; public class ScpSnapshot extends SystemCommandTask { @Expose - private String lectureUuid = null; - @Expose - private String username = null; + private String editId = null; @Expose private String clientIp = null; @Expose - private String snapshotPath = null; + private String lectureId = null; private final Output status = new Output(); @@ -25,14 +23,12 @@ public class ScpSnapshot extends SystemCommandTask protected boolean initTask() { this.setStatusObject( this.status ); - if ( this.lectureUuid == null ) - this.lectureUuid = ""; - if ( this.username == null ) - this.username = ""; + if ( this.editId == null ) + this.editId = ""; if ( this.clientIp == null ) this.clientIp = ""; - if ( this.snapshotPath == null ) - this.snapshotPath = ""; + if ( this.lectureId == null ) + this.lectureId = ""; return true; } @@ -44,7 +40,6 @@ public class ScpSnapshot extends SystemCommandTask "/usr/bin/sudo", "-n", "-u", "root", - // "/bin/bash", Constants.BASEDIR + "/scripts/scp-snapshot" }; } @@ -52,10 +47,9 @@ public class ScpSnapshot extends SystemCommandTask @Override protected void initEnvironment( Map<String, String> environment ) { - environment.put( "TM_UUID", this.lectureUuid ); - environment.put( "TM_USERNAME", this.username); - environment.put( "TM_CLIENT_IP", this.clientIp); - environment.put( "TM_SNAPSHOT_PATH", this.snapshotPath); + environment.put( "TM_EDIT_ID", this.editId ); + environment.put( "TM_CLIENT_IP", this.clientIp ); + environment.put( "TM_LECTURE_ID", this.lectureId); } @Override |