промежуточный. частичный рефакторинг смены глобальный настроек. автоотключение проверки бд тестов если активных пакетов нет.
This commit is contained in:
@@ -145,6 +145,7 @@ public class TasksDatabase extends SQLiteDatabase {
|
||||
return sum;
|
||||
}
|
||||
//--
|
||||
/*
|
||||
public Vector<TasksPackage> getActivePackages() {
|
||||
Vector<TasksPackage> res = new Vector<>();
|
||||
for (TasksPackage p : packages.Data.values())
|
||||
@@ -159,6 +160,7 @@ public class TasksDatabase extends SQLiteDatabase {
|
||||
res.add(p);
|
||||
return res;
|
||||
}
|
||||
*/
|
||||
public SapforTasksPackage getFirstActiveSapforPackage() {
|
||||
SapforTasksPackage first_active = null;
|
||||
SapforTasksPackage first_queued = null;
|
||||
@@ -189,4 +191,15 @@ public class TasksDatabase extends SQLiteDatabase {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
public boolean hasActivePackages() {
|
||||
for (TasksPackage tasksPackage : packages.Data.values()) {
|
||||
if (tasksPackage.state.isActive())
|
||||
return true;
|
||||
}
|
||||
for (SapforTasksPackage sapforTasksPackage : sapforTasksPackages.Data.values()) {
|
||||
if (sapforTasksPackage.state.isActive())
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,8 +23,16 @@ public enum TasksPackageState implements StatusEnum {
|
||||
//---------------------------------------
|
||||
Analysis,
|
||||
Done,
|
||||
Aborted
|
||||
;
|
||||
Aborted;
|
||||
public boolean isActive() {
|
||||
switch (this) {
|
||||
case Done:
|
||||
case Aborted:
|
||||
return false;
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public Font getFont() {
|
||||
switch (this) {
|
||||
|
||||
@@ -46,10 +46,6 @@ import java.util.stream.Collectors;
|
||||
|
||||
import static TestingSystem.TasksDatabase.tests_db_name;
|
||||
public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
public static boolean email = false;
|
||||
public static boolean checkTasks = false;
|
||||
public static int checkIntervalSecond = 10;
|
||||
public static int kernels = 4;
|
||||
LinkedHashMap<String, TasksDatabase> accountsBases = new LinkedHashMap<>();
|
||||
//--------------------------------->>>
|
||||
public TestingServer() {
|
||||
@@ -233,17 +229,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
protected TestingPlanner testingPlanner = new TestingPlanner();
|
||||
protected Thread testingThread = new Thread(() -> testingPlanner.Perform());
|
||||
//------>>>
|
||||
public static void switchTimer(boolean on) {
|
||||
if (on)
|
||||
TimerOn();
|
||||
else
|
||||
TimerOff();
|
||||
}
|
||||
public static Timer checkTimer = null;
|
||||
public static void TimerOn() {
|
||||
checkTasks = true;
|
||||
checkTimer = new Timer(checkIntervalSecond * 1000, e -> {
|
||||
// Pass_2021.passes.get(PassCode_2021.ActualizePackages).Do();
|
||||
System.out.println("timer on");
|
||||
checkTimer = new Timer(Global.properties.CheckTestingIntervalSeconds * 1000, e -> {
|
||||
Pass_2021.passes.get(PassCode_2021.SynchronizeTestsTasks).Do();
|
||||
});
|
||||
checkTimer.start();
|
||||
@@ -252,7 +241,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
System.out.println("timer off");
|
||||
if (checkTimer != null)
|
||||
checkTimer.stop();
|
||||
checkTasks = false;
|
||||
}
|
||||
public static void ResetTimer() {
|
||||
TimerOff();
|
||||
@@ -397,8 +385,8 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
//1 - архивировать пакет.
|
||||
File packageArchive = sapforTasksPackage.getArchive();
|
||||
Utils.forceDeleteWithCheck(packageArchive);
|
||||
System.out.println("src = "+Utils.Brackets(sapforTasksPackage.workspace));
|
||||
System.out.println("dst="+Utils.Brackets(packageArchive.getAbsolutePath()));
|
||||
System.out.println("src = " + Utils.Brackets(sapforTasksPackage.workspace));
|
||||
System.out.println("dst=" + Utils.Brackets(packageArchive.getAbsolutePath()));
|
||||
//---
|
||||
ZipFolderPass zip = new ZipFolderPass();
|
||||
if (zip.Do(sapforTasksPackage.workspace, packageArchive.getAbsolutePath())) {
|
||||
|
||||
Reference in New Issue
Block a user