no message
This commit is contained in:
1
.idea/workspace.xml
generated
1
.idea/workspace.xml
generated
@@ -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$/.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/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/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>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|||||||
@@ -1,31 +1,17 @@
|
|||||||
package TestingSystem.DVM;
|
package TestingSystem.DVM;
|
||||||
import Common.Constants;
|
import Common.Constants;
|
||||||
import Common.Current;
|
|
||||||
import Common.Global;
|
import Common.Global;
|
||||||
import Common.Utils.Utils;
|
import Common.Utils.Utils;
|
||||||
import GlobalData.Machine.Machine;
|
|
||||||
import GlobalData.Machine.MachineType;
|
|
||||||
import GlobalData.RemoteFile.RemoteFile;
|
import GlobalData.RemoteFile.RemoteFile;
|
||||||
import GlobalData.Tasks.TaskState;
|
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.TasksPackageState;
|
||||||
import TestingSystem.Common.TestingPlanner;
|
|
||||||
import TestingSystem.DVM.DVMPackage.DVMPackage;
|
|
||||||
import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
|
import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
|
||||||
import TestingSystem.DVM.DVMTasks.DVMRunTask;
|
import TestingSystem.DVM.DVMTasks.DVMRunTask;
|
||||||
import TestingSystem.DVM.DVMTasks.DVMTask;
|
|
||||||
import Visual_DVM_2021.Passes.All.UnzipFolderPass;
|
import Visual_DVM_2021.Passes.All.UnzipFolderPass;
|
||||||
import Visual_DVM_2021.UI.Interface.Loggable;
|
|
||||||
import javafx.util.Pair;
|
import javafx.util.Pair;
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileFilter;
|
|
||||||
import java.net.InetAddress;
|
|
||||||
import java.nio.charset.Charset;
|
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
||||||
@@ -57,7 +43,6 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
|||||||
Print("Соединение c " + machine.getURL() + " " + user.login + " сброшено.");
|
Print("Соединение c " + machine.getURL() + " " + user.login + " сброшено.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//----
|
//----
|
||||||
@Override
|
@Override
|
||||||
protected void TestsSynchronize() throws Exception {
|
protected void TestsSynchronize() throws Exception {
|
||||||
@@ -244,7 +229,6 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
|
|||||||
protected void MachineConnectionError() {
|
protected void MachineConnectionError() {
|
||||||
Finalize("Количество безуспешных попыток соединения с машиной " + machine.getURL() + " превысило 10");
|
Finalize("Количество безуспешных попыток соединения с машиной " + machine.getURL() + " превысило 10");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void Kill() throws Exception {
|
protected void Kill() throws Exception {
|
||||||
if (!testingPackage.PID.isEmpty()) {
|
if (!testingPackage.PID.isEmpty()) {
|
||||||
|
|||||||
@@ -520,7 +520,7 @@ public class UserConnection {
|
|||||||
String modules_log = compileModules(modulesDirectory);
|
String modules_log = compileModules(modulesDirectory);
|
||||||
if (!modules_log.isEmpty())
|
if (!modules_log.isEmpty())
|
||||||
throw new PassException(modules_log);
|
throw new PassException(modules_log);
|
||||||
|
//--
|
||||||
RemoteFile info = new RemoteFile(userWorkspace, email);
|
RemoteFile info = new RemoteFile(userWorkspace, email);
|
||||||
user.connection.writeToFile("", info);
|
user.connection.writeToFile("", info);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ public abstract class TaskConnectionPass<S extends RemoteTaskSupervisor> extends
|
|||||||
machine = supervisor.task.getMachine();
|
machine = supervisor.task.getMachine();
|
||||||
user = supervisor.task.getUser();
|
user = supervisor.task.getUser();
|
||||||
super.Connect();
|
super.Connect();
|
||||||
|
user.connection.CheckUserInitialization(Current.getAccount().email);
|
||||||
|
/*
|
||||||
RemoteFile userWorkspace = new RemoteFile(user.workspace, true);
|
RemoteFile userWorkspace = new RemoteFile(user.workspace, true);
|
||||||
if (!user.connection.Exists(userWorkspace))
|
if (!user.connection.Exists(userWorkspace))
|
||||||
throw new WorkspaceNotFoundException(
|
throw new WorkspaceNotFoundException(
|
||||||
@@ -30,6 +32,7 @@ public abstract class TaskConnectionPass<S extends RemoteTaskSupervisor> extends
|
|||||||
+ "\n" + Utils.Brackets(user.workspace) + "\nне найдено.\n" +
|
+ "\n" + Utils.Brackets(user.workspace) + "\nне найдено.\n" +
|
||||||
"Требуется выполнить повторную инициализацию пользователя."
|
"Требуется выполнить повторную инициализацию пользователя."
|
||||||
);
|
);
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void ServerAction() throws Exception {
|
protected void ServerAction() throws Exception {
|
||||||
|
|||||||
Reference in New Issue
Block a user