M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-05-21 23:48:01 +03:00
parent fa04452d3d
commit e860e7968f
4 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/workspace.xml generated
View File

@@ -10,6 +10,7 @@
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

16
src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
View File

@@ -1,31 +1,17 @@
package TestingSystem.DVM;
import Common.Constants;
import Common.Current;
import Common.Global;
import Common.Utils.Utils;
import GlobalData.Machine.Machine;
import GlobalData.Machine.MachineType;
import GlobalData.RemoteFile.RemoteFile;
import GlobalData.Tasks.TaskState;
import GlobalData.User.User;
import ProjectData.Files.ProjectFile;
import ProjectData.LanguageName;
import Repository.Server.ServerCode;
import TestingSystem.Common.TasksPackageState;
import TestingSystem.Common.TestingPlanner;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import TestingSystem.DVM.DVMTasks.DVMRunTask;
import TestingSystem.DVM.DVMTasks.DVMTask;
import Visual_DVM_2021.Passes.All.UnzipFolderPass;
import Visual_DVM_2021.UI.Interface.Loggable;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.FileFilter;
import java.net.InetAddress;
import java.nio.charset.Charset;
import java.nio.file.Paths;
import java.util.*;
public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
@@ -57,7 +43,6 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
Print("Соединение c " + machine.getURL() + " " + user.login + " сброшено.");
}
}
//----
@Override
protected void TestsSynchronize() throws Exception {
@@ -244,7 +229,6 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
protected void MachineConnectionError() {
Finalize("Количество безуспешных попыток соединения с машиной " + machine.getURL() + " превысило 10");
}
@Override
protected void Kill() throws Exception {
if (!testingPackage.PID.isEmpty()) {

2
src/TestingSystem/DVM/UserConnection.java
View File

@@ -520,7 +520,7 @@ public class UserConnection {
String modules_log = compileModules(modulesDirectory);
if (!modules_log.isEmpty())
throw new PassException(modules_log);
//--
RemoteFile info = new RemoteFile(userWorkspace, email);
user.connection.writeToFile("", info);
}

3
src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
View File

@@ -22,6 +22,8 @@ public abstract class TaskConnectionPass<S extends RemoteTaskSupervisor> extends
machine = supervisor.task.getMachine();
user = supervisor.task.getUser();
super.Connect();
user.connection.CheckUserInitialization(Current.getAccount().email);
/*
RemoteFile userWorkspace = new RemoteFile(user.workspace, true);
if (!user.connection.Exists(userWorkspace))
throw new WorkspaceNotFoundException(
@@ -30,6 +32,7 @@ public abstract class TaskConnectionPass<S extends RemoteTaskSupervisor> extends
+ "\n" + Utils.Brackets(user.workspace) + "\nне найдено.\n" +
"Требуется выполнить повторную инициализацию пользователя."
);
*/
}
@Override
protected void ServerAction() throws Exception {