diff --git a/dinky-admin/src/main/java/org/dinky/context/ConsoleContextHolder.java b/dinky-admin/src/main/java/org/dinky/context/ConsoleContextHolder.java index f6295da2ce..cd4f827474 100644 --- a/dinky-admin/src/main/java/org/dinky/context/ConsoleContextHolder.java +++ b/dinky-admin/src/main/java/org/dinky/context/ConsoleContextHolder.java @@ -94,20 +94,21 @@ public ProcessEntity getProcess(String processName) { * * @param processName process name * @param stepPid process step type - * @param log messages + * @param logLine messages * @throws BusException Throws an exception if the process does not exist */ - public void appendLog(String processName, String stepPid, String log, boolean recordGlobal) { + public void appendLog(String processName, String stepPid, String logLine, boolean recordGlobal) { if (!logPross.containsKey(processName)) { - throw new BusException(StrFormatter.format("process {} does not exist", processName)); + log.debug("Process {} does not exist, This log was abandoned", processName); + return; } ProcessEntity process = logPross.get(processName); if (recordGlobal) { - process.appendLog(log); + process.appendLog(logLine); } if (stepPid != null) { ProcessStepEntity stepNode = getStepNode(stepPid, getStepsMap(processName)); - stepNode.appendLog(log); + stepNode.appendLog(logLine); process.setLastUpdateStep(stepNode); } // /TOPIC/PROCESS_CONSOLE/FlinkSubmit/12 diff --git a/dinky-admin/src/main/java/org/dinky/context/SseSessionContextHolder.java b/dinky-admin/src/main/java/org/dinky/context/SseSessionContextHolder.java index 4f1e270a94..4050c3b887 100644 --- a/dinky-admin/src/main/java/org/dinky/context/SseSessionContextHolder.java +++ b/dinky-admin/src/main/java/org/dinky/context/SseSessionContextHolder.java @@ -173,7 +173,7 @@ public static void sendTopic(String topic, Object content) { * @param content The SSE data to send. * @throws IOException If an I/O error occurs while sending the data. */ - public static void sendSse(String sessionKey, SseDataVo content) throws IOException { + public static void sendSse(String sessionKey, SseDataVo content) throws Exception { if (exists(sessionKey)) { sessionMap.get(sessionKey).getEmitter().send(content); } else { diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/SuggestionServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/SuggestionServiceImpl.java index 56587a6fbf..3cef8b8d96 100644 --- a/dinky-admin/src/main/java/org/dinky/service/impl/SuggestionServiceImpl.java +++ b/dinky-admin/src/main/java/org/dinky/service/impl/SuggestionServiceImpl.java @@ -67,8 +67,6 @@ public Set getSuggestions(boolean enableSchemaSuggestion) { if (enableSchemaSuggestion) { buildSchemaSuggestions(new HashSet<>(), suggestionVOS); } - // 4. 自定义关键词提示 - buildCustomSuggestions(new HashSet<>(), suggestionVOS); // flink config提示 buildFlinkConfSuggestions(suggestionVOS); return suggestionVOS; @@ -110,18 +108,6 @@ private static void buildSchemaSuggestions(Set buildingSchemaList, Set customKeyWordList, Set suggestionVOS) { - // todo: 自定义关键词提示, - // 1. 此处自定义是属于 dinky 内部自定义语法关键词提示, 如果有片段, 将片段的建议列表加入到文档中进行提示 - // 2. 可以加入 yml 语法的关键词提示 , 因为在集群配置中会有 yml 的配置文件写法 , 获取方式待定 - } - /** * build document suggestions *