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

fiх

Browse Source
This commit is contained in:
02090095
2023-10-09 22:51:54 +03:00
parent c43cb7bfe6
commit 94e77b4607
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/workspace.xml generated
View File

@@ -8,14 +8,8 @@
<component name="ChangeListManager"> <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$/.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/Common/Utils/InterruptThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/InterruptThread.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/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

2
src/Common/Utils/InterruptThread.java
View File

@@ -13,9 +13,9 @@ public class InterruptThread extends Thread{
while (true) { while (true) {
Thread.sleep(sleep_ms); Thread.sleep(sleep_ms);
if (interruptFile.exists()) { if (interruptFile.exists()) {
action.call();
FileUtils.writeStringToFile(new File(Constants.ABORTED), ""); FileUtils.writeStringToFile(new File(Constants.ABORTED), "");
FileUtils.forceDelete(interruptFile); FileUtils.forceDelete(interruptFile);
action.call();
} }
} }
} catch (Exception ex) { } catch (Exception ex) {

7
src/Repository/RepositoryServer.java
View File

@@ -66,6 +66,7 @@ public abstract class RepositoryServer<D extends Database> {
} }
protected Thread interruptThread = new InterruptThread(10000, protected Thread interruptThread = new InterruptThread(10000,
() -> { () -> {
System.out.println("INTERRUPT FILE FOUND");
System.exit(0); System.exit(0);
return null; return null;
}); });
@@ -99,7 +100,7 @@ public abstract class RepositoryServer<D extends Database> {
} }
//------------------------------ //------------------------------
for (String target : message_in.targets) { for (String target : message_in.targets) {
System.out.println("target="+target); System.out.println("target=" + target);
if (needsEmail(target)) { if (needsEmail(target)) {
System.out.println("needs email"); System.out.println("needs email");
try { try {
@@ -141,11 +142,11 @@ public abstract class RepositoryServer<D extends Database> {
ex.printStackTrace(); ex.printStackTrace();
Print(ex.getMessage()); Print(ex.getMessage());
} }
}else System.out.println("does not need email"); } else System.out.println("does not need email");
} }
System.out.println("EMAIL ENDED"); System.out.println("EMAIL ENDED");
} }
public boolean needsEmail(String email){ public boolean needsEmail(String email) {
return true; return true;
} }
public void PublishAction(DBObject object) throws Exception { public void PublishAction(DBObject object) throws Exception {