From 3244fe74e89e298847e7fd1a9917e212cec1db28 Mon Sep 17 00:00:00 2001
From: fengzero <fengzero@fengzero.com>
Date: Wed, 22 Jun 2022 08:11:19 +0000
Subject: [PATCH] set adapter name in uninit msg

---
 src/adapter/adapter.c |  1 +
 src/core/manager.c    | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c
index 3289524e..c73c4d6b 100644
--- a/src/adapter/adapter.c
+++ b/src/adapter/adapter.c
@@ -549,6 +549,7 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
 
         header->type = NEU_RESP_NODE_UNINIT;
         neu_msg_exchange(header);
+        strcpy(header->sender, adapter->name);
         strcpy(cmd->node, adapter->name);
         uninit_msg = neu_msg_gen(header, cmd);
 
diff --git a/src/core/manager.c b/src/core/manager.c
index e0ea1efb..ed29a03e 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -96,6 +96,7 @@ void neu_manager_destroy(neu_manager_t *manager)
     nng_msg *           uninit_msg = NULL;
     UT_array *pipes = neu_node_manager_get_pipes_all(manager->node_manager);
 
+    strcpy(header.sender, "manager");
     utarray_foreach(pipes, nng_pipe *, pipe)
     {
         uninit_msg = neu_msg_gen(&header, &uninit);
@@ -262,7 +263,8 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data)
         neu_resp_node_uninit_t *cmd = (neu_resp_node_uninit_t *) &header[1];
 
         neu_manager_del_node(manager, cmd->node);
-        if (strlen(header->receiver) > 0) {
+        if (strlen(header->receiver) > 0 &&
+            strcmp(header->receiver, "manager") != 0) {
             neu_resp_error_t error = { 0 };
             header->type           = NEU_RESP_ERROR;
             reply(manager, header, &error);
@@ -452,8 +454,11 @@ inline static void forward_msg_dup(neu_manager_t *manager, nng_msg *msg,
 
     nng_msg_dup(&out_msg, msg);
     nng_msg_set_pipe(out_msg, pipe);
-    nng_sendmsg(manager->socket, out_msg, 0);
-    nlog_info("forward msg to pipe %d", pipe.id);
+    if (nng_sendmsg(manager->socket, out_msg, 0) == 0) {
+        nlog_info("forward msg to pipe %d", pipe.id);
+    } else {
+        nng_msg_free(out_msg);
+    }
 }
 
 inline static void forward_msg(neu_manager_t *manager, nng_msg *msg,
@@ -464,8 +469,11 @@ inline static void forward_msg(neu_manager_t *manager, nng_msg *msg,
 
     nng_msg_dup(&out_msg, msg);
     nng_msg_set_pipe(out_msg, pipe);
-    nng_sendmsg(manager->socket, out_msg, 0);
-    nlog_info("forward msg to %s", node);
+    if (nng_sendmsg(manager->socket, out_msg, 0) == 0) {
+        nlog_info("forward msg to %s", node);
+    } else {
+        nng_msg_free(out_msg);
+    }
 }
 
 static void start_static_adapter(neu_manager_t *manager, const char *name)
@@ -495,5 +503,7 @@ inline static void reply(neu_manager_t *manager, neu_reqresp_head_t *header,
 
     nng_msg_set_pipe(msg, pipe);
 
-    nng_sendmsg(manager->socket, msg, 0);
+    if (nng_sendmsg(manager->socket, msg, 0) != 0) {
+        nng_msg_free(msg);
+    }
 }
\ No newline at end of file