From 4e503d3b9bc2051b1788b59631f6f68b692e2a2b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 8 Apr 2024 01:30:46 +0300
Subject: [PATCH] =?UTF-8?q?v++=20=D0=9B=D0=B8=D0=BC=D0=B8=D1=82=20=D0=BE?=
 =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B8?=
 =?UTF-8?q?=2010?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 10 +++-
 properties                                    |  2 +-
 src/Repository/Component/Visualiser.java      |  2 +-
 .../Common/TasksPackageState.java             |  7 ++-
 .../Common/TestingPackage/TestingPackage.java |  3 ++
 src/TestingSystem/Common/TestingPlanner.java  | 50 ++++++++++++-------
 src/TestingSystem/Common/TestsDatabase.java   |  2 +
 src/TestingSystem/DVM/UserConnection.java     |  4 +-
 8 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7416d0db..b508a532 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,15 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
+    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TasksPackageState.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/properties b/properties
index dc3602c8..80a4ba95 100644
--- a/properties
+++ b/properties
@@ -10,7 +10,7 @@
   "SMTPHost": "smtp.mail.ru",
   "SMTPPort": 465,
   "MailSocketPort": 465,
-  "collapseCredentials": true,
+  "collapseCredentials": false,
   "collapseFileGraphs": false,
   "collapseFileMessages": false,
   "collapseProjectTrees": false,
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 7dd0e29c..e659065b 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1091;
+        version = 1092;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/TestingSystem/Common/TasksPackageState.java b/src/TestingSystem/Common/TasksPackageState.java
index ae5b9705..f8efc70c 100644
--- a/src/TestingSystem/Common/TasksPackageState.java
+++ b/src/TestingSystem/Common/TasksPackageState.java
@@ -28,12 +28,15 @@ public enum TasksPackageState implements StatusEnum {
     Analysis,
     //-
     Done,
-    Aborted;
+    Aborted,
+    ConnectionError
+    ;
     public boolean isActive() {
         switch (this) {
             case Done:
             case Aborted:
             case Draft:
+            case ConnectionError:
                 return false;
             default:
                 return true;
@@ -88,6 +91,8 @@ public enum TasksPackageState implements StatusEnum {
                 return "анализ результатов";
             case Done:
                 return "завершен";
+            case ConnectionError:
+                return "Сбой связи";
             default:
                 return StatusEnum.super.getDescription();
         }
diff --git a/src/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
index 594eb02d..cba46571 100644
--- a/src/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -20,6 +20,8 @@ public abstract class TestingPackage<J> extends riDBObject {
     public int progress = 0; //прогресс выполнения
     public long StartDate = 0;
     public long ChangeDate = 0;
+    @Description("DEFAULT 0")
+    public int connectionErrosCount = 0;
     public TasksPackageState state = TasksPackageState.Draft;
     //--
     @Override
@@ -36,6 +38,7 @@ public abstract class TestingPackage<J> extends riDBObject {
         progress = tp.progress;
         StartDate = tp.StartDate;
         ChangeDate = tp.ChangeDate;
+        connectionErrosCount = tp.connectionErrosCount;
         state = tp.state;
     }
     public TestingPackage(TestingPackage p) {
diff --git a/src/TestingSystem/Common/TestingPlanner.java b/src/TestingSystem/Common/TestingPlanner.java
index 19aa7892..8fc83f62 100644
--- a/src/TestingSystem/Common/TestingPlanner.java
+++ b/src/TestingSystem/Common/TestingPlanner.java
@@ -138,28 +138,40 @@ public abstract class TestingPlanner<P extends TestingPackage> {
         //--
         Print(testingPackage.id + ":" + testingPackage.state.getDescription());
         //--
-        InitSessionCredentials();
-        if (testingPackage.state.equals(TasksPackageState.Analysis)) {
-            AnalyseResults();
-            UpdatePackageState(TasksPackageState.Done);
-        } else {
-            try {
-                if (Connect()) {
-                    int ptk_id = (int) ServerCommand(getCheckIfNeedsKillCode(), testingPackage.id);
-                    if (ptk_id != Constants.Nan) {
-                        Print("package " + testingPackage.id + " NEEDS TO KILL");
-                        Kill();
-                        UpdatePackageState(TasksPackageState.Aborted);
-                        ServerCommand(ServerCode.DeleteObjectByPK, new Pair(TestingPackageToKill.class, ptk_id));
+        if (testingPackage.connectionErrosCount>=10){
+            Print(testingPackage.id+" had 10 connection errors. stop");
+            UpdatePackageState(TasksPackageState.ConnectionError);
+        }else {
+            //--
+            InitSessionCredentials();
+            if (testingPackage.state.equals(TasksPackageState.Analysis)) {
+                AnalyseResults();
+                UpdatePackageState(TasksPackageState.Done);
+            } else {
+                try {
+                    if (Connect()) {
+                        int ptk_id = (int) ServerCommand(getCheckIfNeedsKillCode(), testingPackage.id);
+                        if (ptk_id != Constants.Nan) {
+                            Print("package " + testingPackage.id + " NEEDS TO KILL");
+                            Kill();
+                            UpdatePackageState(TasksPackageState.Aborted);
+                            ServerCommand(ServerCode.DeleteObjectByPK, new Pair(TestingPackageToKill.class, ptk_id));
+                        } else {
+                            Session();
+                        }
                     } else {
-                        Session();
+                        testingPackage.connectionErrosCount++;
+                        UpdatePackage();
                     }
+                } catch (Exception ex) {
+                    Print("Ошибка сеанса. Соединение будет разорвано.");
+                    Print(ex.getMessage());
+                    Disconnect();
+                    //
+                    testingPackage.connectionErrosCount++;
+                    UpdatePackage();
+                } finally {
                 }
-            } catch (Exception ex) {
-                Print("Ошибка сеанса. Соединение будет разорвано.");
-                Print(ex.getMessage());
-                Disconnect();
-            } finally {
             }
         }
         //--
diff --git a/src/TestingSystem/Common/TestsDatabase.java b/src/TestingSystem/Common/TestsDatabase.java
index b13bd648..d4c3ef5b 100644
--- a/src/TestingSystem/Common/TestsDatabase.java
+++ b/src/TestingSystem/Common/TestsDatabase.java
@@ -77,6 +77,7 @@ public class TestsDatabase extends SQLiteDatabase {
                 case Done:
                 case Aborted:
                 case Draft:
+                case ConnectionError:
                     break;
                 default:
                     packages.add(p);
@@ -116,6 +117,7 @@ public class TestsDatabase extends SQLiteDatabase {
                 case Done:
                 case Aborted:
                 case Draft:
+                case ConnectionError:
                     break;
                 default:
                     //активен.
diff --git a/src/TestingSystem/DVM/UserConnection.java b/src/TestingSystem/DVM/UserConnection.java
index 907e6d1a..7d11089f 100644
--- a/src/TestingSystem/DVM/UserConnection.java
+++ b/src/TestingSystem/DVM/UserConnection.java
@@ -96,7 +96,9 @@ public class UserConnection {
         if (sftpChannel != null) sftpChannel.disconnect();
         if (shellChannel != null) shellChannel.disconnect();
         if (execChannel != null) execChannel.disconnect();
-        if (session != null) session.disconnect();
+        if (session != null) {
+            session.disconnect();
+        }
         //----------------------
         sftpChannel = null;
         shellChannel = null;