The Unified and Autonomous Development Platform
fix: Pause instruction in command step not working sometimes (#1799)
Robin Shen8387d8fb0980
diff --git a/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java b/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.javaindex 6f5aae5e31..d8fb1199f2 100644--- a/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java+++ b/server-core/src/main/java/io/onedev/server/job/log/DefaultLogManager.java@@ -175,34 +175,40 @@ public class DefaultLogManager implements LogManager, Serializable {} else {styleBuilder = new StyleBuilder();}- if (message.startsWith(LogInstruction.PREFIX)) {- InstructionContext instructionContext = LogInstruction.parse(message);- String name = instructionContext.Identifier().getText();-- LogInstruction instruction = null;- for (LogInstruction extension: OneDev.getExtensions(LogInstruction.class)) {- if (extension.getName().equals(name)) {- instruction = extension;- break;+ if (message.contains(LogInstruction.PREFIX)) {+ // remove ansi codes+ var normalizedMessage = message.replaceAll("\u001B\\[[;\\d]*m", "");+ if (normalizedMessage.startsWith(LogInstruction.PREFIX)) {+ InstructionContext instructionContext = LogInstruction.parse(normalizedMessage);+ String name = instructionContext.Identifier().getText();++ LogInstruction instruction = null;+ for (LogInstruction extension: OneDev.getExtensions(LogInstruction.class)) {+ if (extension.getName().equals(name)) {+ instruction = extension;+ break;+ }}- }- if (instruction != null) {- Map<String, List<String>> params = new HashMap<>();- for (ParamContext paramContext: instructionContext.param()) {- String paramName;- if (paramContext.Identifier() != null)- paramName = paramContext.Identifier().getText();- else- paramName = "";- List<String> paramValues = new ArrayList<>();- for (TerminalNode terminalNode: paramContext.Value())- paramValues.add(LogInstruction.getValue(terminalNode));- params.put(paramName, paramValues);+ if (instruction != null) {+ Map<String, List<String>> params = new HashMap<>();+ for (ParamContext paramContext: instructionContext.param()) {+ String paramName;+ if (paramContext.Identifier() != null)+ paramName = paramContext.Identifier().getText();+ else+ paramName = "";+ List<String> paramValues = new ArrayList<>();+ for (TerminalNode terminalNode: paramContext.Value())+ paramValues.add(LogInstruction.getValue(terminalNode));+ params.put(paramName, paramValues);+ }+ doInSession(instruction, buildId, params, this);+ } else {+ doLog("Unsupported log instruction: " + name, new StyleBuilder());}- doInSession(instruction, buildId, params, this);} else {- doLog("Unsupported log instruction: " + name, new StyleBuilder());+ doLog(message, styleBuilder);}} else {doLog(message, styleBuilder);