Merge remote-tracking branch 'upstream/dev' into spilit

4 years ago · 0081ce0342
1 changed files with 6 additions and 2 deletions
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
@ -298,8 +298,12 @@ public class SqlTask extends AbstractTask {
        String result = JSONUtils.toJsonString(resultJSONArray);
        logger.debug("execute sql : {}", result);

-        sendAttachment(sqlParameters.getGroupId(), StringUtils.isNotEmpty(sqlParameters.getTitle()) ? sqlParameters.getTitle() : taskExecutionContext.getTaskName() + " query result sets",
-                JSONUtils.toJsonString(resultJSONArray));
+        try {
+            sendAttachment(sqlParameters.getGroupId(), StringUtils.isNotEmpty(sqlParameters.getTitle()) ? sqlParameters.getTitle() : taskExecutionContext.getTaskName() + " query result sets",
+                    JSONUtils.toJsonString(resultJSONArray));
+        } catch (Exception e) {
+            logger.warn("sql task sendAttachment error! msg : {} ", e.getMessage());
+        }
    }

    /**