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

++

Browse Source 
добивание живых задач, отключение лишней рассылки админам, настройка удаления или не удаления пакета на машине
This commit is contained in:
02090095
2025-03-14 13:48:30 +03:00
parent 9f4eb9d88e
commit a2017f9e01
17 changed files with 95 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
View File

@@ -18,7 +18,6 @@ public abstract class TestingPackage<J> extends riDBObject {
//--
public int kernels = 1;
public int needsEmail = 0;
//---
public String version = ""; //версия тестируемого объекта
public String drv = ""; //пусть к исполняемому файлы тестируемого объекта
//--

5
src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
View File

@@ -107,9 +107,8 @@ public abstract class TestingPlanner<P extends TestingPackage> extends TestingCl
message.subject = "Состояние пакета тестирования " + packageDescription() + " " +
Utils_.Brackets(testingPackage.id) + " изменилось на " + Utils_.Brackets(testingPackage.state.getDescription());
message.text = testingPackage.description;
Vector<String> recipients = new Vector<>(Constants.admins_mails);
if (!recipients.contains(testingPackage.sender_address))
recipients.add(testingPackage.sender_address);
Vector<String> recipients = new Vector<>();
recipients.add(testingPackage.sender_address);
//--
for (String address : recipients)
ServerCommand(ServerCode.Email, address, message);

8
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
View File

@@ -19,6 +19,7 @@ import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import com.sun.org.glassfish.gmbal.Description;
import javafx.util.Pair;
import java.io.File;
@@ -32,6 +33,9 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
public String user_name = "";
public String user_workspace;
//---
@Description("DEFAULT 1")
public int eraseWorkspace = 1; //удалять рабочее пространство пакета на целевой машине.(отключать для отладки)
//---
public DVMPackage() {
}
public DVMPackage(UserAccount account,
@@ -39,7 +43,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
User user,
Compiler compiler,
Vector<DVMConfiguration> configurations,
int neeedsEmail_in) {
int neeedsEmail_in, int eraseWorkspace_in) {
id = CommonConstants.Nan;
//-
sender_name = account.name;
@@ -56,6 +60,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
version = compiler.getVersionInfo();
//-
needsEmail = neeedsEmail_in;
eraseWorkspace = eraseWorkspace_in;
//--
state = TasksPackageState.Queued;
//--
@@ -158,6 +163,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
machine_port = tasksPackage.machine_port;
user_name = tasksPackage.user_name;
user_workspace = tasksPackage.user_workspace;
eraseWorkspace = tasksPackage.eraseWorkspace;
}
public Machine getMachine() {
return new Machine(machine_name, machine_address, machine_port, MachineType.Server);

2
src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
View File

@@ -269,7 +269,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
UpdatePackageState(TasksPackageState.Analysis);
}
//---
if (user.connection.Exists(packageRemoteWorkspace))
if (testingPackage.eraseWorkspace!=0 && user.connection.Exists(packageRemoteWorkspace))
user.connection.RMDIR(packageRemoteWorkspace.full_name);
}
@Override