update period to 10 and fix ECM log info

WeDataSphere · Oct 16, 2023 · ddb0a47 · ddb0a47
1 parent 89f3d51
commit ddb0a47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 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
                 )