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

fix(性能测试): 修复停止性能测试时报NULL的问题 

--bug=1016101 --user=刘瑞斌 [性能测试] github#17179-执行过程中，无法停止执行 https://www.tapd.cn/55049933/s/1230237

Closes #17179
This commit is contained in:
CaptainB 2022-08-22 19:26:11 +08:00 committed by 刘瑞斌
parent 194eff2c04
commit 3e4b4488f0
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import io.metersphere.performance.engine.AbstractEngine;
import io.metersphere.performance.engine.request.StartTestRequest;
import io.metersphere.service.SystemParameterService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.web.client.RestTemplate;
import java.util.HashMap;
@ -28,8 +29,16 @@ import java.util.UUID;
public class DockerTestEngine extends AbstractEngine {
private static final String BASE_URL = "http://%s:%d";
private RestTemplate restTemplate;
private RestTemplate restTemplateWithTimeOut;
private static final RestTemplate restTemplate = new RestTemplate();
private static final RestTemplate restTemplateWithTimeOut = new RestTemplate();
static {
HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory();
httpRequestFactory.setConnectionRequestTimeout(2000);
httpRequestFactory.setConnectTimeout(2000);
httpRequestFactory.setReadTimeout(10000);
restTemplateWithTimeOut.setRequestFactory(httpRequestFactory);
}
public DockerTestEngine(LoadTestReportWithBLOBs loadTestReport) {
this.init(loadTestReport);
@ -38,8 +47,6 @@ public class DockerTestEngine extends AbstractEngine {
@Override
protected void init(LoadTestReportWithBLOBs loadTestReport) {
super.init(loadTestReport);
this.restTemplate = (RestTemplate) CommonBeanFactory.getBean("restTemplate");
this.restTemplateWithTimeOut = (RestTemplate) CommonBeanFactory.getBean("restTemplateWithTimeOut");
}
@Override