[incubator-dolphinscheduler] branch dev updated: fix alert server client send. (#4587)

[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 bba3dbd  fix alert server client send. (#4587)
bba3dbd is described below

commit bba3dbde17ec0f9fa6d430081822c83c8bd6a8ea
Author: zhuangchong <37063904+zhuangch...@users.noreply.github.com>
AuthorDate: Wed Jan 27 15:19:11 2021 +0800

    fix alert server client send. (#4587)
---
 .../org/apache/dolphinscheduler/alert/runner/AlertSender.java     | 4 ++--
 .../org/apache/dolphinscheduler/server/worker/WorkerServer.java   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
 
b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
index d635574..e8c6880 100644
--- 
a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
+++ 
b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java
@@ -106,8 +106,8 @@ public class AlertSender {
 
         List<AlertPluginInstance> alertInstanceList = 
alertDao.listInstanceByAlertGroupId(alertGroupId);
         AlertData alertData = new AlertData();
-        alertData.setContent(title)
-            .setTitle(content);
+        alertData.setContent(content)
+            .setTitle(title);
 
         boolean sendResponseStatus = true;
         List<AlertSendResponseResult> sendResponseResults = new ArrayList<>();
diff --git 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
index bcc0828..1f138f6 100644
--- 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
+++ 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
@@ -103,11 +103,14 @@ public class WorkerServer {
     public void run() {
         logger.info("start worker server...");
 
+        //alert-server client registry
+        alertClientService = new 
AlertClientService(workerConfig.getAlertListenHost(),Constants.ALERT_RPC_PORT);
+
         //init remoting server
         NettyServerConfig serverConfig = new NettyServerConfig();
         serverConfig.setListenPort(workerConfig.getListenPort());
         this.nettyRemotingServer = new NettyRemotingServer(serverConfig);
-        
this.nettyRemotingServer.registerProcessor(CommandType.TASK_EXECUTE_REQUEST, 
new TaskExecuteProcessor());
+        
this.nettyRemotingServer.registerProcessor(CommandType.TASK_EXECUTE_REQUEST, 
new TaskExecuteProcessor(alertClientService));
         
this.nettyRemotingServer.registerProcessor(CommandType.TASK_KILL_REQUEST, new 
TaskKillProcessor());
         this.nettyRemotingServer.registerProcessor(CommandType.DB_TASK_ACK, 
new DBTaskAckProcessor());
         
this.nettyRemotingServer.registerProcessor(CommandType.DB_TASK_RESPONSE, new 
DBTaskResponseProcessor());
@@ -116,9 +119,6 @@ public class WorkerServer {
         // worker registry
         this.workerRegistry.registry();
 
-        //alert-server client registry
-        alertClientService = new 
AlertClientService(workerConfig.getAlertListenHost(),Constants.ALERT_RPC_PORT);
-
         // retry report task status
         this.retryReportTaskStatusThread.start();