github issue 1806

byzer-org · Aug 10, 2022 · 98c3a2d · 98c3a2d
1 parent 783d1f8
commit 98c3a2d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/conf/err-msg-template.json b/conf/err-msg-template.json
@@ -0,0 +1,3 @@
+[
+  { "regexp": "MLSQL Parser error in .*?", "msg": "MLSQL Parser error"}
+]
diff --git a/streamingpro-mlsql/src/main/java/streaming/rest/RestController.scala b/streamingpro-mlsql/src/main/java/streaming/rest/RestController.scala
@@ -144,6 +144,8 @@ class RestController extends ApplicationController with WowLog with Logging {
         paramAsLong("timeout", -1L)
       )
       val context = createScriptSQLExecListener(sparkSession, jobInfo.groupId)
+      // Save to context, so that plugins can use it.
+      context.addEnv("show_stack", param("show_stack", "false"))
 
       def query = {
         if (paramAsBoolean("async", false)) {
@@ -178,23 +180,19 @@ class RestController extends ApplicationController with WowLog with Logging {
             } catch {
               case e: Exception =>
                 e.printStackTrace()
-                val msgBuffer = ArrayBuffer[String]()
-                if (paramAsBoolean("show_stack", false)) {
-                  format_full_exception(msgBuffer, e)
-                }
+
+                val msg = ExceptionRenderManager.call(e).str.getOrElse( e.getMessage )
 
                 executeWithRetrying[HttpResponse](maxTries)(
                   RestUtils.httpClientPost(urlString,
                     Map("stat" -> s"""failed""",
-                      "msg" -> (e.getMessage + "\n" + msgBuffer.mkString("\n")),
+                      "msg" -> msg ,
                       "jobInfo" -> JSONTool.toJsonStr(jobInfo)),
                     callbackHeader),
                   HttpStatus.SC_OK == _.getStatusLine.getStatusCode,
                   response => logger.error(s"Fail SQL callback request failed after ${maxTries} attempts, " +
                     s"the last response status is: ${response.getStatusLine.getStatusCode}.")
                 )
-
-
             }
           })
         } else {
@@ -239,8 +237,8 @@ class RestController extends ApplicationController with WowLog with Logging {
     } catch {
       case e: Exception =>
         logError("An error occurred while the job manager was executing the task, ", e)
-        val msg = ExceptionRenderManager.call(e)
-        render(500, msg.str.get)
+        val msg = ExceptionRenderManager.call(e).str.getOrElse(e.getMessage)
+        render(500, msg)
     } finally {
       RequestCleanerManager.call()
       cleanActiveSessionInSpark