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

refactor(接口测试): 优化监听方法 

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
This commit is contained in:
fit2-zhao 2024-09-23 09:55:02 +08:00 committed by Craftsman
parent 4d0010aff0
commit f92ad3f3a6
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
api-test/backend/src/main/java/io/metersphere/api/jmeter/ApiLocalRunner.java
View File

@ -2,10 +2,8 @@ package io.metersphere.api.jmeter;
import io.metersphere.jmeter.LocalRunner; import io.metersphere.jmeter.LocalRunner;
import io.metersphere.utils.LoggerUtil; import io.metersphere.utils.LoggerUtil;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy; import jakarta.annotation.PreDestroy;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.engine.StandardJMeterEngine; import org.apache.jmeter.engine.StandardJMeterEngine;
import org.apache.jorphan.collections.HashTree; import org.apache.jorphan.collections.HashTree;
@ -17,15 +15,13 @@ import java.util.concurrent.ConcurrentHashMap;
@Component @Component
@NoArgsConstructor @NoArgsConstructor
public class ApiLocalRunner extends LocalRunner { public class ApiLocalRunner extends LocalRunner {
private final static Map<String, StandardJMeterEngine> runningTasks = new ConcurrentHashMap<>(); private static final Map<String, StandardJMeterEngine> runningTasks = new ConcurrentHashMap<>();
private boolean isRunning = true;
private HashTree jmxTree; private HashTree jmxTree;
public ApiLocalRunner(HashTree jmxTree) { public ApiLocalRunner(HashTree jmxTree) {
this.jmxTree = jmxTree; this.jmxTree = jmxTree;
} }
public void run(String report) { public void run(String report) {
StandardJMeterEngine engine = new StandardJMeterEngine(); StandardJMeterEngine engine = new StandardJMeterEngine();
engine.configure(this.jmxTree); engine.configure(this.jmxTree);
@ -34,12 +30,15 @@ public class ApiLocalRunner extends LocalRunner {
LoggerUtil.info("LocalRunner 开始执行报告", report); LoggerUtil.info("LocalRunner 开始执行报告", report);
engine.runTest(); engine.runTest();
} catch (Exception e) { } catch (Exception e) {
LoggerUtil.error("运行报告时出错", e);
engine.stopTest(true); engine.stopTest(true);
} finally {
runningTasks.remove(report); // Ensure removal on completion
} }
} }
public static void stop(String report) { public static void stop(String report) {
if (MapUtils.isNotEmpty(runningTasks)) { if (StringUtils.isNotEmpty(report)) {
StandardJMeterEngine engine = runningTasks.get(report); StandardJMeterEngine engine = runningTasks.get(report);
if (engine != null) { if (engine != null) {
engine.stopTest(true); engine.stopTest(true);
@ -54,26 +53,7 @@ public class ApiLocalRunner extends LocalRunner {
} }
} }
@PostConstruct
public void checkRunningTasks() {
new Thread(() -> {
while (isRunning) {
try {
Thread.sleep(1000 * 60);
if (MapUtils.isNotEmpty(runningTasks)) {
runningTasks.keySet().stream()
.filter(reportId -> !runningTasks.get(reportId).isActive())
.forEach(runningTasks::remove);
}
} catch (Exception e) {
LoggerUtil.error("检查运行中的任务异常：", e);
}
}
}).start();
}
@PreDestroy @PreDestroy
public void destroy() { public void destroy() {
isRunning = false;
} }
} }