no message
This commit is contained in:
@@ -2,13 +2,13 @@ package _VisualDVM.Repository.Server;
|
||||
import java.util.Calendar;
|
||||
public class BackUpsChecker extends RepositoryServerClient {
|
||||
RepositoryServer server;
|
||||
public BackUpsChecker(RepositoryServer server_in) {
|
||||
server = server_in;
|
||||
}
|
||||
@Override
|
||||
protected RepositoryServer getServer() {
|
||||
return server;
|
||||
}
|
||||
public BackUpsChecker(RepositoryServer server_in) {
|
||||
server = server_in;
|
||||
}
|
||||
@Override
|
||||
protected int getSleepMillis() {
|
||||
return 60000;
|
||||
@@ -19,7 +19,7 @@ public class BackUpsChecker extends RepositoryServerClient {
|
||||
int hour = rightNow.get(Calendar.HOUR_OF_DAY);
|
||||
int minute = rightNow.get(Calendar.MINUTE);
|
||||
if ((hour == 1) && (minute == 45)) {
|
||||
ServerCommand(ServerCode.CreateBackUp,false);
|
||||
ServerCommand(ServerCode.CreateBackUp, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,13 +18,13 @@ import java.util.LinkedHashMap;
|
||||
import java.util.Properties;
|
||||
public class EmailChecker extends RepositoryServerClient {
|
||||
RepositoryServer server;
|
||||
public EmailChecker(RepositoryServer server_in) {
|
||||
server = server_in;
|
||||
}
|
||||
@Override
|
||||
protected RepositoryServer getServer() {
|
||||
return server;
|
||||
}
|
||||
public EmailChecker(RepositoryServer server_in) {
|
||||
server = server_in;
|
||||
}
|
||||
@Override
|
||||
protected int getSleepMillis() {
|
||||
return 5000;
|
||||
|
||||
@@ -21,15 +21,19 @@ import java.io.*;
|
||||
import java.net.ServerSocket;
|
||||
import java.net.Socket;
|
||||
import java.nio.file.Files;
|
||||
import java.util.*;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.Vector;
|
||||
public abstract class RepositoryServer<D extends Database> {
|
||||
//--
|
||||
public static ZipFolderPass zip = new ZipFolderPass();
|
||||
public static UnzipFolderPass unzip = new UnzipFolderPass();
|
||||
public static ArchivesBackupPass backupSession = new ArchivesBackupPass();
|
||||
;
|
||||
//--
|
||||
public static Vector<Pair<String, EmailMessage>> EmailMessagesQueue = null;
|
||||
protected static FileWriter Log;
|
||||
protected static boolean printOn = true;
|
||||
public String getServerFileName() {
|
||||
return Constants.ApplicationFileName;
|
||||
}
|
||||
;
|
||||
public abstract String getServerHomeName();
|
||||
//-
|
||||
public D db;
|
||||
protected Socket clientSocket; //сокет для общения
|
||||
@@ -43,26 +47,20 @@ public abstract class RepositoryServer<D extends Database> {
|
||||
protected long count = 0; //для отладки.
|
||||
EmailChecker emailChecker = null;
|
||||
BackUpsChecker backUpsChecker = null;
|
||||
/*
|
||||
public static Vector<Pair<Machine, User>> storages = new Vector<>(
|
||||
Arrays.asList(new Pair<>(new Machine("titan",
|
||||
"dvmh.keldysh.ru",
|
||||
22, MachineType.Server),
|
||||
new User("dvmuser1", "mprit_2011"))
|
||||
));
|
||||
//-
|
||||
*/
|
||||
/*
|
||||
public static Vector<Pair<Machine, User>> storages = new Vector<>(
|
||||
Arrays.asList(new Pair<>(new Machine("titan",
|
||||
"dvmh.keldysh.ru",
|
||||
22, MachineType.Server),
|
||||
new User("dvmuser1", "mprit_2011"))
|
||||
));
|
||||
//-
|
||||
*/
|
||||
Class<D> d_class;
|
||||
//-----------RECURSION ->
|
||||
SignalHandler signalHandler = signal -> {
|
||||
};
|
||||
//--
|
||||
public static ZipFolderPass zip = new ZipFolderPass();
|
||||
public static UnzipFolderPass unzip = new UnzipFolderPass();
|
||||
public static ArchivesBackupPass backupSession = new ArchivesBackupPass();
|
||||
//--
|
||||
public static Vector<Pair<String, EmailMessage>> EmailMessagesQueue = null;
|
||||
//--
|
||||
public RepositoryServer(Class<D> d_class_in) {
|
||||
d_class = d_class_in;
|
||||
}
|
||||
@@ -89,6 +87,10 @@ public abstract class RepositoryServer<D extends Database> {
|
||||
}
|
||||
}
|
||||
}
|
||||
public String getServerFileName() {
|
||||
return Constants.ApplicationFileName;
|
||||
}
|
||||
public abstract String getServerHomeName();
|
||||
//-DVMTestingChecker
|
||||
public abstract int getPort();
|
||||
protected void Session() throws Exception {
|
||||
@@ -332,7 +334,7 @@ public abstract class RepositoryServer<D extends Database> {
|
||||
int day = rightNow.get(Calendar.DAY_OF_MONTH);
|
||||
//--
|
||||
String backUpName = year + "_" + (month + 1) + "_" + (day);
|
||||
System.out.println("name="+backUpName);
|
||||
System.out.println("name=" + backUpName);
|
||||
File todayBackUp = new File(Global.DataBackUpsDirectory, backUpName);
|
||||
File todayBackUpArchive = new File(Global.DataBackUpsDirectory, backUpName + ".zip");
|
||||
if (force || todayBackUpArchive.exists())
|
||||
@@ -355,18 +357,17 @@ public abstract class RepositoryServer<D extends Database> {
|
||||
// backupSession.Do(cred.getKey(), cred.getValue(), todayBackUpArchive);
|
||||
// }
|
||||
//bonus backup
|
||||
if (!force&&rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY) {
|
||||
if (!force && rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY) {
|
||||
System.out.println("MONDAY");
|
||||
//на почту шлем только базу.
|
||||
EmailMessage message = new EmailMessage(getClass().getSimpleName() + " BackUp","Резервная копия базы данных");
|
||||
EmailMessage message = new EmailMessage(getClass().getSimpleName() + " BackUp", "Резервная копия базы данных");
|
||||
message.addAttachement(db.getFile());
|
||||
for (String address : Constants.admins_mails)
|
||||
EmailMessagesQueue.add(new Pair<>(address,message));
|
||||
EmailMessagesQueue.add(new Pair<>(address, message));
|
||||
//--
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void extraBackup(File todayBackUp) {
|
||||
}
|
||||
//----
|
||||
@@ -432,11 +433,11 @@ public abstract class RepositoryServer<D extends Database> {
|
||||
}
|
||||
void GetFirstEmailToSend() throws Exception {
|
||||
//
|
||||
if (EmailMessagesQueue.isEmpty()){
|
||||
if (EmailMessagesQueue.isEmpty()) {
|
||||
response.object = null;
|
||||
}else {
|
||||
} else {
|
||||
response.object = EmailMessagesQueue.lastElement();
|
||||
EmailMessagesQueue.removeElementAt(EmailMessagesQueue.size()-1);
|
||||
EmailMessagesQueue.removeElementAt(EmailMessagesQueue.size() - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
package _VisualDVM.Repository.Server;
|
||||
import Common.Passes.PassException;
|
||||
import Common.Utils.Utils_;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.Server.RepositoryPass;
|
||||
import _VisualDVM.TestingSystem.Common.TestingServer;
|
||||
|
||||
import java.io.FileWriter;
|
||||
import java.io.Serializable;
|
||||
@@ -31,7 +29,7 @@ public abstract class RepositoryServerClient<T extends RepositoryServer> {
|
||||
}
|
||||
//--
|
||||
protected Object ServerCommand(ServerCode code_in, String arg, Serializable object_in) throws Exception {
|
||||
RepositoryPass<T,Object> pass = new RepositoryPass<T, Object>(getServer()) {
|
||||
RepositoryPass<T, Object> pass = new RepositoryPass<T, Object>(getServer()) {
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return "";
|
||||
|
||||
@@ -72,8 +72,8 @@ public enum ServerCode {
|
||||
CreateBackUp,
|
||||
GetFirstEmailToSend,
|
||||
SynchronizeSapforRepoitory;
|
||||
public String getDescription(){
|
||||
switch (this){
|
||||
public String getDescription() {
|
||||
switch (this) {
|
||||
case SynchronizeSapforRepoitory:
|
||||
return "Синхронизация репозитория SAPFOR на сервере";
|
||||
case Email:
|
||||
@@ -127,7 +127,7 @@ public enum ServerCode {
|
||||
case PublishObjects:
|
||||
return "Публикация объектов на сервере";
|
||||
case ReplaceTestCode:
|
||||
return "Замена кода теста на сервере";
|
||||
return "Замена кода теста на сервере";
|
||||
case GetComponentsBackups:
|
||||
return "Получение резервных копий компонента с сервера";
|
||||
case DVMConvertProject:
|
||||
|
||||
Reference in New Issue
Block a user