[incubator-dolphinscheduler] branch dev updated: [Fix-4738][Mail] Fix send mail failed instead of execute sql error (#4739)

[kirs]

This is an automated email from the ASF dual-hosted git repository.

kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 0c26e10  [Fix-4738][Mail] Fix send mail failed instead of execute sql 
error (#4739)
0c26e10 is described below

commit 0c26e10f3fda98492358a85a51cb609df9ef7033
Author: Shiwen Cheng <chengshiwen0...@gmail.com>
AuthorDate: Thu Feb 11 09:54:07 2021 +0800

    [Fix-4738][Mail] Fix send mail failed instead of execute sql error (#4739)
---
 .../apache/dolphinscheduler/server/worker/task/sql/SqlTask.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git 
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
index 4c328ed..411032f 100644
--- 
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());
+        }
     }
 
     /**