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

no message

Browse Source
This commit is contained in:
02090095
2024-04-26 19:54:34 +03:00
parent 756863ab80
commit 71f746c3b3
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml generated
View File

@@ -8,9 +8,9 @@
<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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/MachineQueueSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/MachineQueueSupervisor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.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" />

1
src/Common/Global.java
View File

@@ -365,6 +365,7 @@ public class Global {
isWindows = false; isWindows = false;
CheckServerDirectories(); CheckServerDirectories();
CreateLogAtComponentsPath(); CreateLogAtComponentsPath();
Utils.createEmptyFile("kek");
componentsServer = new ComponentsServer(); componentsServer = new ComponentsServer();
componentsServer.ActivateDB(); componentsServer.ActivateDB();
componentsServer.Start(); componentsServer.Start();

3
src/Repository/RepositoryClient.java
View File

@@ -49,8 +49,9 @@ public abstract class RepositoryClient {
return Log.isEmpty(); return Log.isEmpty();
} }
}; };
if (!pass.Do()) if (!pass.Do()) {
ServerConnectionError(code_in, pass.Log.toString()); ServerConnectionError(code_in, pass.Log.toString());
}
return pass.target; return pass.target;
} }
protected Object ServerCommand(ServerCode code_in, Serializable object_in) throws Exception { protected Object ServerCommand(ServerCode code_in, Serializable object_in) throws Exception {

4
src/Repository/RepositoryServer.java
View File

@@ -181,10 +181,10 @@ public abstract class RepositoryServer<D extends Database> {
DiagnosticSignalHandler.install("INT", signalHandler); DiagnosticSignalHandler.install("INT", signalHandler);
DiagnosticSignalHandler.install("ABRT", signalHandler); DiagnosticSignalHandler.install("ABRT", signalHandler);
interruptThread.start(); interruptThread.start();
if (!Global.properties.OldServer) startAdditionalThreads();
startAdditionalThreads();
server = new ServerSocket(getPort()); server = new ServerSocket(getPort());
Print("Сервер запущен!"); Print("Сервер запущен!");
// Utils.createEmptyFile("kek");//Constants.STARTED);
StartAction(); StartAction();
while (true) { while (true) {
try { try {