Skip to content

Commit 64f8b73

Browse files
committed
change other -> sys_info
1 parent c8e5bbe commit 64f8b73

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

platform-agent/src/main/java/com/flow/platform/agent/CmdManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ public void run() {
201201
return;
202202
}
203203

204-
if (cmd.getType() == CmdType.OTHER) {
204+
if (cmd.getType() == CmdType.SYSTEM_INFO) {
205205
LogEventHandler logListener = new LogEventHandler(cmd);
206206
Log log = new Log(Type.STDERR, collectionAgentInfo());
207-
log.setCategory(Category.OTHER);
207+
log.setCategory(Category.SYSTEM_INFO);
208208
logListener.onLog(log);
209209
logListener.onFinish();
210210
}

platform-api/src/main/java/com/flow/platform/api/consumer/CmdLoggingConsumer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
6969
sendCmdLog(cmdId, content, number);
7070
}
7171

72-
if (category.equals("OTHER")) {
72+
if (category.equals("SYSTEM_INFO")) {
7373
sendAgentSysInfo(content);
7474
}
7575
}

platform-api/src/main/java/com/flow/platform/api/controller/JobController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void create() {
120120
* ]
121121
*/
122122
@GetMapping(path = "/{root}")
123-
public List<Job> index(@RequestParam Map<String, String> allParams, SearchCondition condition) {
123+
public List<Job> index(@RequestParam Map<String, String> allParams, SearchCondition condition) {
124124
String path = currentNodePath.get();
125125

126126
List<String> paths = null;
@@ -226,7 +226,7 @@ public String stepLogs(@PathVariable Integer buildNumber, @PathVariable Integer
226226
String path = currentNodePath.get();
227227
try {
228228
return logService.findNodeLog(path, buildNumber, stepOrder);
229-
} catch (Throwable e){
229+
} catch (Throwable e) {
230230
LOGGER.warn("log not found: %s", e.getMessage());
231231
return StringUtil.EMPTY;
232232
}
@@ -291,7 +291,7 @@ public Collection<Job> latestStatus(@RequestBody List<String> paths) {
291291
* ]
292292
*/
293293
@PostMapping(path = "/{root}/search")
294-
public List<Job> search(@RequestBody SearchCondition condition){
294+
public List<Job> search(@RequestBody SearchCondition condition) {
295295
String path = currentNodePath.get();
296296

297297
List<String> paths = null;

platform-api/src/main/java/com/flow/platform/api/service/AgentServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ private String buildAgentWebhook() {
175175

176176
@Override
177177
public void sendSysCmd(AgentPath agentPath) {
178-
CmdInfo cmdInfo = new CmdInfo(agentPath, CmdType.OTHER, "java -version");
178+
CmdInfo cmdInfo = new CmdInfo(agentPath, CmdType.SYSTEM_INFO, "java -version");
179179
cmdService.sendCmd(agentPath, cmdInfo);
180180
}
181181
}

platform-cmd-runner/src/main/java/com/flow/platform/cmd/Log.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public Log(Type type, String content, Integer count) {
3939

4040
public enum Category {
4141
DEFAULT,
42-
OTHER
42+
SYSTEM_INFO
4343
}
4444

4545
private Category category = Category.DEFAULT;

platform-control-center/src/main/java/com/flow/platform/cc/service/CmdDispatchServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ private class RunOtherCmdHandler extends CmdHandler {
374374

375375
@Override
376376
CmdType handleType() {
377-
return CmdType.OTHER;
377+
return CmdType.SYSTEM_INFO;
378378
}
379379

380380
@Override

platform-domain/src/main/java/com/flow/platform/domain/CmdType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public enum CmdType implements Serializable {
5151
/**
5252
* run other command, do not affect step command running
5353
*/
54-
OTHER("OTHER"),
54+
SYSTEM_INFO("SYSTEM_INFO"),
5555

5656
/**
5757
* Stop agent, delete session and shutdown machine

0 commit comments

Comments
 (0)