Skip to content

Commit

Permalink
refactor: rename logstore filed isMatrixApp to usePlatformResource
Browse files Browse the repository at this point in the history
  • Loading branch information
liulei16 committed May 11, 2024
1 parent aa63daa commit cb5e9c4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public class MilogLogStoreDO extends BaseCommon {
@Column(value = "is_matrix_app")
@ColDefine(type = ColType.BOOLEAN)
@Default("false")
private Boolean isMatrixApp;
private Boolean usePlatformResource;

@Column(value = "es_index")
@ColDefine(type = ColType.VARCHAR, width = 256)
Expand All @@ -99,18 +99,18 @@ public class MilogLogStoreDO extends BaseCommon {
public MilogLogStoreDO() {
}

public MilogLogStoreDO(Long spaceId, String logstoreName, Integer storePeriod, Integer shardCnt, String keyList, Integer logType, Boolean isMatrixApp) {
public MilogLogStoreDO(Long spaceId, String logstoreName, Integer storePeriod, Integer shardCnt, String keyList, Integer logType, Boolean usePlatformResource) {
this.logstoreName = logstoreName;
this.spaceId = spaceId;
this.storePeriod = storePeriod;
this.shardCnt = shardCnt;
this.keyList = keyList;
this.logType = logType;
this.isMatrixApp = isMatrixApp;
this.usePlatformResource = usePlatformResource;
}

public boolean isMatrixAppStore() {
return this.isMatrixApp == null ? false : this.isMatrixApp;
public boolean isPlatformResourceStore() {
return this.usePlatformResource == null ? false : this.usePlatformResource;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class LogStoreParam {
* 1. Service application logs
*/
private Integer logType;
private Boolean isMatrixApp;
private Boolean usePlatformResource;
private String esIndex;
private String machineRoom;
/**
Expand All @@ -55,7 +55,7 @@ public class LogStoreParam {

private Boolean nameSameStatus = Boolean.FALSE;

public boolean isMatrixAppStore() {
return this.isMatrixApp == null ? false : this.isMatrixApp;
public boolean isPlatformResourceStore() {
return this.usePlatformResource == null ? false : this.usePlatformResource;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ private MilogLogTailDo logTailParam2Do(LogTailParam logTailParam, MilogLogStoreD
}
tailExtensionService.logTailDoExtraFiled(milogLogtailDo, logStoreDO, logTailParam);
milogLogtailDo.setDeployWay(logTailParam.getDeployWay());
if (logStoreDO.isMatrixAppStore()) {
if (logStoreDO.isPlatformResourceStore()) {
milogLogtailDo.setDeploySpace((StringUtils.isNotEmpty(logTailParam.getDeploySpace()) ? logTailParam.getDeploySpace().trim() : ""));
}
milogLogtailDo.setFirstLineReg((StringUtils.isNotEmpty(logTailParam.getFirstLineReg()) ? logTailParam.getFirstLineReg() : ""));
Expand Down

0 comments on commit cb5e9c4

Please sign in to comment.