Merge pull request #316 from WeDataSphere/dev-1.1.16-webank-logperiod

update period to 10 and fix ecm log info
WeDataSphere · Oct 17, 2023 · f19fe29 · f19fe29
2 parents 89f3d51 + 480f50e
commit f19fe29
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...nn-manager-server/src/main/scala/org/apache/linkis/ecm/server/conf/ECMConfiguration.scala b/...nn-manager-server/src/main/scala/org/apache/linkis/ecm/server/conf/ECMConfiguration.scala
@@ -80,7 +80,7 @@ object ECMConfiguration {
     GovernanceCommonConf.ENGINE_CONN_MANAGER_SPRING_NAME.getValue
 
   val ECM_HEALTH_REPORT_PERIOD: Long =
-    CommonVars("wds.linkis.ecm.health.report.period", 30).getValue
+    CommonVars("wds.linkis.ecm.health.report.period", 10).getValue
 
   val ECM_HEALTH_REPORT_DELAY: Long =
     CommonVars("wds.linkis.ecm.health.report.delay", 10).getValue

diff --git a/...governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogManager.scala b/...governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogManager.scala
@@ -63,7 +63,7 @@ abstract class LogManager extends LogListener with Logging {
           var writeLog = log
           errorCodeManager.foreach(_.errorMatchAndGetContent(log).foreach {
             case (code, errorMsg, targetMsg) =>
-              if (!targetMsg.contains(LogUtils.ERROR_STR)) {
+              if (!targetMsg.contains(LogUtils.ERROR_STR) && log.contains(LogUtils.ERROR_STR)) {
                 writeLog = LogUtils.generateERROR(
                   s"error code: $code, errorMsg: $errorMsg, errorLine: $targetMsg \n" + log
                 )

diff --git a/...on/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java b/...on/src/main/java/org/apache/linkis/configuration/restful/api/ConfigurationRestfulApi.java
@@ -518,8 +518,8 @@ public Message saveKeyValue(HttpServletRequest req, @RequestBody Map<String, Obj
     if (engineType.equals("*") && !version.equals("*")) {
       return Message.error("When engineType is any engine, the version must also be any version");
     }
-    if (StringUtils.isBlank(configKey) || StringUtils.isBlank(value)) {
-      return Message.error("key or value cannot be empty");
+    if (StringUtils.isBlank(configKey)) {
+      return Message.error("key cannot be empty");
     }
     if (StringUtils.isNotBlank(user)) {
       username = user;