update log of match error code to error level

WeDataSphere · Sep 19, 2023 · ae2f45d · ae2f45d
1 parent 2503979
commit ae2f45d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/log/LogUtils.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/log/LogUtils.scala
@@ -33,7 +33,7 @@ object LogUtils {
   }
 
   def generateERROR(rawLog: String): String = {
-    getTimeFormat + " " + "ERROR" + " " + rawLog
+    getTimeFormat + " " + ERROR_STR + " " + rawLog
   }
 
   def generateWarn(rawLog: String): String = {
@@ -52,4 +52,7 @@ object LogUtils {
     getTimeFormat + " " + "SYSTEM-WARN" + " " + rawLog
   }
 
+  val ERROR_STR = "ERROR"
+
+
 }
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
@@ -17,6 +17,7 @@
 
 package org.apache.linkis.entrance.log
 
+import org.apache.linkis.common.log.LogUtils
 import org.apache.linkis.common.utils.{Logging, Utils}
 import org.apache.linkis.entrance.EntranceContext
 import org.apache.linkis.entrance.job.EntranceExecutionJob
@@ -59,10 +60,19 @@ abstract class LogManager extends LogListener with Logging {
               }
             }
           }
-          entranceExecutionJob.getLogWriter.foreach(logWriter => logWriter.write(log))
-          errorCodeManager.foreach(_.errorMatch(log).foreach { case (code, errorMsg) =>
-            errorCodeListener.foreach(_.onErrorCodeCreated(job, code, errorMsg))
+          var writeLog = log
+          errorCodeManager.foreach(_.errorMatch(log).foreach {
+            case (code, errorMsg) =>
+              if (!writeLog.contains(LogUtils.ERROR_STR)) {
+                writeLog = LogUtils.generateERROR(log + "\n") + LogUtils.generateERROR(
+                  s"error code: $code, errorMsg: $errorMsg"
+                )
+              }
+              errorCodeListener.foreach(_.onErrorCodeCreated(job, code, errorMsg))
+            case _ =>
           })
+          entranceExecutionJob.getLogWriter.foreach(logWriter => logWriter.write(writeLog))
+
         case _ =>
       }
     } {