рефактиринг рассылки.v++
This commit is contained in:
@@ -107,8 +107,7 @@ public abstract class TestingPlanner<P extends TestingPackage> extends Repositor
|
||||
message.subject = "Состояние пакета тестирования " + packageDescription() + " " +
|
||||
Utils_.Brackets(testingPackage.id) + " изменилось на " + Utils_.Brackets(testingPackage.state.getDescription());
|
||||
message.text = testingPackage.description;
|
||||
message.targets.add(testingPackage.sender_address);
|
||||
ServerCommand(ServerCode.Email, message);
|
||||
ServerCommand(ServerCode.Email, testingPackage.sender_address, message);
|
||||
}
|
||||
}
|
||||
//---
|
||||
|
||||
@@ -262,13 +262,14 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
EmailMessage message = Log.isEmpty() ?
|
||||
new EmailMessage(
|
||||
"Запущено автоматическое тестирование версии " + request.arg + " системы SAPFOR",
|
||||
"Пакет " + Utils_.Brackets(autoPackage.id), new Vector<>()) :
|
||||
"Пакет " + Utils_.Brackets(autoPackage.id)) :
|
||||
new EmailMessage(
|
||||
"Не удалось запустить автоматическое тестирование версии " + request.arg + " системы SAPFOR",
|
||||
Log.toString(),
|
||||
new Vector<>()
|
||||
Log.toString()
|
||||
);
|
||||
Email(message);
|
||||
for (String address: Constants.admins_mails){
|
||||
Email(message, address);
|
||||
}
|
||||
break;
|
||||
case DownloadTest:
|
||||
Print("Отправить клиенту тест " + request.arg);
|
||||
|
||||
@@ -24,7 +24,6 @@ import java.io.File;
|
||||
import java.nio.charset.Charset;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.Date;
|
||||
import java.util.Vector;
|
||||
public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
||||
File workspace;
|
||||
ServerSapfor sapfor;
|
||||
@@ -320,12 +319,13 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
|
||||
//-
|
||||
EmailMessage message = new EmailMessage(
|
||||
"Выполнена сборка системы SAPFOR",
|
||||
"Версия: " + version_s + "\n" + "Статус: " + status,
|
||||
new Vector<>()
|
||||
"Версия: " + version_s + "\n" + "Статус: " + status
|
||||
);
|
||||
message.addAttachement(out);
|
||||
message.addAttachement(err);
|
||||
//-
|
||||
ServerCommand(ServerCode.Email, "", message);
|
||||
for (String address : Constants.admins_mails) {
|
||||
ServerCommand(ServerCode.Email, address, message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user