новые директивы. v++

src/TestingSystem/Common/TestingPlanner.java

@@ -109,23 +109,19 @@ public abstract class TestingPlanner<P extends TestingPackage> {
             case TestsSynchronize:
                 TestsSynchronize();
                 UpdatePackageState(TasksPackageState.PackageWorkspaceCreation);
-                Disconnect();
                 break;
             case PackageWorkspaceCreation:
                 PackageWorkspaceCreation();
                 UpdatePackageState(TasksPackageState.PackageStart);
-                Disconnect();
                 break;
             case PackageStart:
                 PackageStart();
                 testingPackage.StartDate = new Date().getTime();
                 UpdatePackageState(getStateAfterStart());
-                Disconnect();
                 break;
             case RunningEnd:
                 DownloadResults();
                 UpdatePackageState(TasksPackageState.Analysis);
-                Disconnect();
                 break;
             default:
                 if (CheckNextState()) UpdatePackage();
@@ -166,11 +162,11 @@ public abstract class TestingPlanner<P extends TestingPackage> {
                 } catch (Exception ex) {
                     Print("Ошибка сеанса. Соединение будет разорвано.");
                     Print(ex.getMessage());
-                    Disconnect();
                     //
                     testingPackage.connectionErrosCount++;
                     UpdatePackage();
                 } finally {
+                    Disconnect();
                 }
             }
         }

src/TestingSystem/DVM/DVMTestingPlanner.java

@@ -27,7 +27,6 @@ import java.util.*;
 public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
     //----
     LinkedHashMap<String, Machine> machines = new LinkedHashMap<>();
-    //todo приделать к ним очередь? или сделать в бд тестирования список машин.
     LinkedHashMap<String, User> users = new LinkedHashMap<>();
     //-- текущие машина и пользователь.
     Machine machine = null;
@@ -196,25 +195,6 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
             Print("waiting for package start...");
             Utils.sleep(1000);
         }
-        /*
-         String plannerStartCommand = String.join(" ", "nohup",
-                Utils.DQuotes(getPlanner()),
-                Utils.DQuotes(user.workspace),
-                Utils.DQuotes(packageRemoteWorkspace.full_name),
-                Utils.DQuotes(testingPackage.kernels),
-                Utils.DQuotes(testingPackage.drv), "&");
-
-        user.connection.CommandNoWait("ulimit -s unlimited",plannerStartCommand);
-        RemoteFile PID = new RemoteFile(packageRemoteWorkspace, "PID");
-        RemoteFile STARTED = new RemoteFile(packageRemoteWorkspace, "STARTED");
-        while (!user.connection.Exists(STARTED)) {
-            Print("waiting for package start...");
-            Utils.sleep(1000);
-        }
-        if (user.connection.Exists(PID)) {
-            testingPackage.PID = user.connection.readFromFile(PID);
-        }
-         */
     }
     @Override
     protected boolean CheckNextState() throws Exception {