From ddb0a47510a88867fcd136610f655d5068927fb5 Mon Sep 17 00:00:00 2001 From: aiceflower Date: Mon, 16 Oct 2023 21:52:44 +0800 Subject: [PATCH] update period to 10 and fix ECM log info --- .../org/apache/linkis/ecm/server/conf/ECMConfiguration.scala | 2 +- .../main/scala/org/apache/linkis/entrance/log/LogManager.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/conf/ECMConfiguration.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/conf/ECMConfiguration.scala index b22aa1443c..6526f9b061 100644 --- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/conf/ECMConfiguration.scala +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-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/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogManager.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogManager.scala index 659a61f963..19f4c5c6ad 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/log/LogManager.scala +++ b/linkis-computation-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 )