test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:metersphere/metersphere

This commit is contained in:
chenjianxing 2021-03-12 17:00:35 +08:00
parent 74deed5032 e9e3dce76c
commit 82b004df60
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/main/java/io/metersphere/performance/engine/docker/DockerTestEngine.java
View File

@ -103,12 +103,18 @@ public class DockerTestEngine extends AbstractEngine {
startTestRequest.setEnv(env); startTestRequest.setEnv(env);
String uri = String.format(BASE_URL + "/jmeter/container/start", nodeIp, port); String uri = String.format(BASE_URL + "/jmeter/container/start", nodeIp, port);
ResultHolder result = restTemplate.postForObject(uri, startTestRequest, ResultHolder.class); try {
if (result == null) { ResultHolder result = restTemplate.postForObject(uri, startTestRequest, ResultHolder.class);
MSException.throwException(Translator.get("start_engine_fail")); if (result == null) {
} MSException.throwException(Translator.get("start_engine_fail"));
if (!result.isSuccess()) { }
MSException.throwException(result.getMessage()); if (!result.isSuccess()) {
MSException.throwException(result.getMessage());
}
} catch (MSException e) {
throw e;
} catch (Exception e) {
MSException.throwException("Please check node-controller status.");
} }
} }