Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Rename isMatrixApp to usePlatformResource #339

Merged
merged 1 commit into from
May 11, 2024
Merged

refactor: Rename isMatrixApp to usePlatformResource #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...log/log-manager/src/main/java/com/xiaomi/mone/log/manager/model/pojo/MilogLogStoreDO.java
View file
Open in desktop
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;
}

}
6 changes: 3 additions & 3 deletions ozhera-log/log-manager/src/main/java/com/xiaomi/mone/log/manager/model/vo/LogStoreParam.java
View file
Open in desktop
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;
}
}
2 changes: 1 addition & 1 deletion ...og-manager/src/main/java/com/xiaomi/mone/log/manager/service/impl/LogTailServiceImpl.java
View file
Open in desktop
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
Loading