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

chore: 控制台log输出调整 

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
This commit is contained in:
fit2-zhao 2024-10-16 16:22:01 +08:00
parent 16b83f14b6
commit 7e667578dd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
framework/sdk-parent/jmeter/src/main/java/org/apache/jmeter/util/SSLManager.java
View File

@ -137,7 +137,7 @@ public abstract class SSLManager {
log.info("Total of {} aliases loaded OK from PKCS11", keyStore.getAliasCount()); log.info("Total of {} aliases loaded OK from PKCS11", keyStore.getAliasCount());
} else { } else {
File initStore = new File(fileName); File initStore = new File(fileName);
if (fileName.length() > 0 && initStore.exists()) { if (!fileName.isEmpty() && initStore.exists()) {
retryLoadKeys(initStore, true); retryLoadKeys(initStore, true);
if (log.isInfoEnabled()) { if (log.isInfoEnabled()) {
log.info("Total of {} aliases loaded OK from keystore {}", log.info("Total of {} aliases loaded OK from keystore {}",
@ -152,7 +152,7 @@ public abstract class SSLManager {
if (threadContext != null && threadContext.getCurrentSampler() != null) { if (threadContext != null && threadContext.getCurrentSampler() != null) {
String resourceId = threadContext.getCurrentSampler().getPropertyAsString("MS-KEYSTORE-ID"); String resourceId = threadContext.getCurrentSampler().getPropertyAsString("MS-KEYSTORE-ID");
if (StringUtils.isNotBlank(resourceId) && keyMap.containsKey(resourceId)) { if (StringUtils.isNotBlank(resourceId) && keyMap.containsKey(resourceId)) {
log.info("重新加载认证文件{}", resourceId); log.info("Reloading authentication file for resource ID：{}", resourceId);
KeystoreDTO dto = keyMap.get(resourceId); KeystoreDTO dto = keyMap.get(resourceId);
// 加载认证文件 // 加载认证文件
try (InputStream in = new FileInputStream(new File(dto.getPath()))) { try (InputStream in = new FileInputStream(new File(dto.getPath()))) {
@ -161,7 +161,7 @@ public abstract class SSLManager {
} }
} }
} catch (Exception e) { } catch (Exception e) {
log.error("证书处理失败{}", e.getMessage()); log.error("Failed to process keystore：{}", e.getMessage());
} }
} }
} }