From 94e77b460741d7fabfad44abaa0059d6198b38c1 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 9 Oct 2023 22:51:54 +0300
Subject: [PATCH] =?UTF-8?q?fi=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                   | 10 ++--------
 src/Common/Utils/InterruptThread.java |  2 +-
 src/Repository/RepositoryServer.java  |  7 ++++---
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 979ff7d6..8499f6d8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,14 +8,8 @@
   <component name="ChangeListManager">
     <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$/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage_info.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTestsOnServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/InterruptThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/InterruptThread.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Utils/InterruptThread.java b/src/Common/Utils/InterruptThread.java
index 2fd7876c..57f53184 100644
--- a/src/Common/Utils/InterruptThread.java
+++ b/src/Common/Utils/InterruptThread.java
@@ -13,9 +13,9 @@ public class InterruptThread extends Thread{
                 while (true) {
                     Thread.sleep(sleep_ms);
                     if (interruptFile.exists()) {
-                        action.call();
                         FileUtils.writeStringToFile(new File(Constants.ABORTED), "");
                         FileUtils.forceDelete(interruptFile);
+                        action.call();
                     }
                 }
             } catch (Exception ex) {
diff --git a/src/Repository/RepositoryServer.java b/src/Repository/RepositoryServer.java
index f909bea9..a453fe45 100644
--- a/src/Repository/RepositoryServer.java
+++ b/src/Repository/RepositoryServer.java
@@ -66,6 +66,7 @@ public abstract class RepositoryServer<D extends Database> {
     }
     protected Thread interruptThread = new InterruptThread(10000,
             () -> {
+                System.out.println("INTERRUPT FILE FOUND");
                 System.exit(0);
                 return null;
             });
@@ -99,7 +100,7 @@ public abstract class RepositoryServer<D extends Database> {
         }
         //------------------------------
         for (String target : message_in.targets) {
-            System.out.println("target="+target);
+            System.out.println("target=" + target);
             if (needsEmail(target)) {
                 System.out.println("needs email");
                 try {
@@ -141,11 +142,11 @@ public abstract class RepositoryServer<D extends Database> {
                     ex.printStackTrace();
                     Print(ex.getMessage());
                 }
-            }else System.out.println("does not need email");
+            } else System.out.println("does not need email");
         }
         System.out.println("EMAIL ENDED");
     }
-    public boolean needsEmail(String email){
+    public boolean needsEmail(String email) {
         return true;
     }
     public void PublishAction(DBObject object) throws Exception {