подправил бекапы. на почту шлется только бд,(иначе вложения не влезают). тестирование сохраняет только бд и тесты.

This commit is contained in:
2025-03-10 01:48:41 +03:00
parent 5653438b75
commit b1740da1f1
5 changed files with 15 additions and 11 deletions

6
.idea/workspace.xml generated
View File

@@ -8,8 +8,10 @@
<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/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/BackUpsChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/BackUpsChecker.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.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" />

View File

@@ -26,7 +26,7 @@
"Kernels": 8, "Kernels": 8,
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe", "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
"CheckTestingIntervalSeconds": 10, "CheckTestingIntervalSeconds": 10,
"AutoCheckTesting": true, "AutoCheckTesting": false,
"EmailOnTestingProgress": true, "EmailOnTestingProgress": true,
"CompleteCompilationOptions": false, "CompleteCompilationOptions": false,
"CompleteRunEnvironments": false, "CompleteRunEnvironments": false,

View File

@@ -18,7 +18,7 @@ public class BackUpsChecker extends RepositoryServerClient {
Calendar rightNow = Calendar.getInstance(); Calendar rightNow = Calendar.getInstance();
int hour = rightNow.get(Calendar.HOUR_OF_DAY); int hour = rightNow.get(Calendar.HOUR_OF_DAY);
int minute = rightNow.get(Calendar.MINUTE); int minute = rightNow.get(Calendar.MINUTE);
if ((hour == 0) && (minute == 0)) { if ((hour == 1) && (minute == 45)) {
ServerCommand(ServerCode.CreateBackUp,false); ServerCommand(ServerCode.CreateBackUp,false);
} }
} }

View File

@@ -323,6 +323,7 @@ public abstract class RepositoryServer<D extends Database> {
} }
void CreateBackUp() throws Exception { void CreateBackUp() throws Exception {
//определить имя папки с багом. //определить имя папки с багом.
System.out.println("create backup");
boolean force = (boolean) request.object; boolean force = (boolean) request.object;
//-- //--
Calendar rightNow = Calendar.getInstance(); Calendar rightNow = Calendar.getInstance();
@@ -331,9 +332,10 @@ public abstract class RepositoryServer<D extends Database> {
int day = rightNow.get(Calendar.DAY_OF_MONTH); int day = rightNow.get(Calendar.DAY_OF_MONTH);
//-- //--
String backUpName = year + "_" + (month + 1) + "_" + (day); String backUpName = year + "_" + (month + 1) + "_" + (day);
System.out.println("name="+backUpName);
File todayBackUp = new File(Global.DataBackUpsDirectory, backUpName); File todayBackUp = new File(Global.DataBackUpsDirectory, backUpName);
File todayBackUpArchive = new File(Global.DataBackUpsDirectory, backUpName + ".zip"); File todayBackUpArchive = new File(Global.DataBackUpsDirectory, backUpName + ".zip");
if (force && todayBackUpArchive.exists()) if (force || todayBackUpArchive.exists())
Utils_.forceDeleteWithCheck(todayBackUpArchive); Utils_.forceDeleteWithCheck(todayBackUpArchive);
//- //-
// Чистка старых бекапов на самом сервере. // Чистка старых бекапов на самом сервере.
@@ -353,11 +355,14 @@ public abstract class RepositoryServer<D extends Database> {
// backupSession.Do(cred.getKey(), cred.getValue(), todayBackUpArchive); // backupSession.Do(cred.getKey(), cred.getValue(), todayBackUpArchive);
// } // }
//bonus backup //bonus backup
if (rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY) { if (!force&&rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY) {
EmailMessage message = new EmailMessage(getClass().getSimpleName() + " BackUp","Резервная копия файлов"); System.out.println("MONDAY");
message.addAttachement(todayBackUpArchive); //на почту шлем только базу.
EmailMessage message = new EmailMessage(getClass().getSimpleName() + " BackUp","Резервная копия базы данных");
message.addAttachement(db.getFile());
for (String address : Constants.admins_mails) for (String address : Constants.admins_mails)
EmailMessagesQueue.add(new Pair<>(address,message)); EmailMessagesQueue.add(new Pair<>(address,message));
//--
} }
} }
} }

View File

@@ -81,9 +81,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
@Override @Override
protected void extraBackup(File todayBackUp) { protected void extraBackup(File todayBackUp) {
zip.Do("Tests", new File(todayBackUp, "Tests.zip").getAbsolutePath()); zip.Do("Tests", new File(todayBackUp, "Tests.zip").getAbsolutePath());
zip.Do("Sapfors", new File(todayBackUp, "Sapfors.zip").getAbsolutePath());
zip.Do("DVMPackages", new File(todayBackUp, "DVMPackages.zip").getAbsolutePath());
zip.Do("SapforPackages", new File(todayBackUp, "SapforPackages.zip").getAbsolutePath());
} }
public static void TimerOn() { public static void TimerOn() {
checkTimer = new Timer(Global.normalProperties.CheckTestingIntervalSeconds * 1000, e -> { checkTimer = new Timer(Global.normalProperties.CheckTestingIntervalSeconds * 1000, e -> {