принудительный обрыв соединения после пересылок и консольных команд.
This commit is contained in:
@@ -110,20 +110,24 @@ public abstract class TestingPlanner<P extends TestingPackage> {
|
||||
case TestsSynchronize:
|
||||
TestsSynchronize();
|
||||
UpdatePackageState(TasksPackageState.PackageWorkspaceCreation);
|
||||
Disconnect();
|
||||
break;
|
||||
case PackageWorkspaceCreation:
|
||||
PackageWorkspaceCreation();
|
||||
UpdatePackageState(TasksPackageState.PackageStart);
|
||||
Disconnect();
|
||||
break;
|
||||
case PackageStart:
|
||||
PackageStart();
|
||||
EmailPackage();
|
||||
testingPackage.StartDate = new Date().getTime();
|
||||
UpdatePackageState(getStateAfterStart());
|
||||
Disconnect();
|
||||
break;
|
||||
case RunningEnd:
|
||||
DownloadResults();
|
||||
UpdatePackageState(TasksPackageState.Analysis);
|
||||
Disconnect();
|
||||
break;
|
||||
default:
|
||||
if (CheckNextState()) UpdatePackage();
|
||||
@@ -134,6 +138,7 @@ public abstract class TestingPlanner<P extends TestingPackage> {
|
||||
public void Perform() {
|
||||
while (true) {
|
||||
try {
|
||||
testingPackage = null;
|
||||
testingPackage = (P) ServerCommand(getActivePackageCode());
|
||||
if (testingPackage != null) {
|
||||
Print(testingPackage.id + ":" + testingPackage.state.getDescription());
|
||||
|
||||
@@ -664,6 +664,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
||||
for (SapforConfigurationCommand command : commands) {
|
||||
db.Delete(command);
|
||||
}
|
||||
} else if (object instanceof DVMPackage) {
|
||||
DVMPackage dvmPackage = (DVMPackage) object;
|
||||
File workspace = new File(Global.PackagesDirectory, String.valueOf(dvmPackage.id));
|
||||
Utils.forceDeleteWithCheck(workspace);
|
||||
}
|
||||
}
|
||||
//---------------------------------------------------------------------------------------------->>>
|
||||
|
||||
@@ -366,8 +366,6 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
|
||||
//--
|
||||
packageRemoteWorkspace = new RemoteFile(user.workspace + "/tests", String.valueOf(testingPackage.id), true);
|
||||
packageLocalWorkspace = new File(Global.PackagesDirectory, String.valueOf(testingPackage.id));
|
||||
//-
|
||||
Print("packageremoteWorkspace=" + Utils.Brackets(packageRemoteWorkspace.full_name));
|
||||
}
|
||||
@Override
|
||||
protected boolean Connect() {
|
||||
|
||||
Reference in New Issue
Block a user