Merge pull request #640 from fengzeroz/main

fix(errorcode): return NEU_ERR_PLUGIN_TAG_NOT_READY when the tag valu…

ft/resource/error.resource

@@ -62,4 +62,6 @@ ${NEU_ERR_PLUGIN_TAG_NOT_ALLOW_WRITE}  		3004
 ${NEU_ERR_PLUGIN_TAG_TYPE_MISMATCH}    		3007
 ${NEU_ERR_PLUGIN_TAG_VALUE_EXPIRED} 	       	3008
 ${NEU_ERR_PLUGIN_PROTOCOL_DECODE_FAILURE}	3009
-${NEU_ERR_PLUGIN_NOT_RUNNING}			3010
+${NEU_ERR_PLUGIN_NOT_RUNNING}			3010
+${NEU_ERR_PLUGIN_TAG_NOT_READY}           	3011
+${NEU_ERR_PLUGIN_PACKET_OUT_OF_ORDER}     	3012

include/neuron/errcodes.h

@@ -94,6 +94,8 @@ typedef enum {
     NEU_ERR_PLUGIN_TAG_VALUE_EXPIRED       = 3008,
     NEU_ERR_PLUGIN_PROTOCOL_DECODE_FAILURE = 3009,
     NEU_ERR_PLUGIN_NOT_RUNNING             = 3010,
+    NEU_ERR_PLUGIN_TAG_NOT_READY           = 3011,
+    NEU_ERR_PLUGIN_PACKET_OUT_OF_ORDER     = 3012,
 
     NEU_ERR_MQTT_FAILURE                        = 4000,
     NEU_ERR_MQTT_NO_CERTFILESET                 = 4001,

plugins/modbus/modbus_tcp.c

@@ -114,8 +114,7 @@ static int driver_start(neu_plugin_t *plugin)
 
 static int driver_stop(neu_plugin_t *plugin)
 {
-    (void) plugin;
-
+    neu_conn_disconnect(plugin->conn);
     return 0;
 }
 

plugins/restful/http.c

@@ -286,6 +286,8 @@ int http_response(nng_aio *aio, neu_err_code_e code, char *content)
     case NEU_ERR_PLUGIN_TAG_TYPE_MISMATCH:
     case NEU_ERR_PLUGIN_PROTOCOL_DECODE_FAILURE:
     case NEU_ERR_PLUGIN_NOT_RUNNING:
+    case NEU_ERR_PLUGIN_TAG_NOT_READY:
+    case NEU_ERR_PLUGIN_PACKET_OUT_OF_ORDER:
         status = NNG_HTTP_STATUS_OK;
         break;
     case NEU_ERR_EINTERNAL:

src/adapter/adapter.c

@@ -240,6 +240,8 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
 
     nng_recvmsg(adapter->sock, &msg, 0);
     header = (neu_reqresp_head_t *) nng_msg_body(msg);
+    nlog_info("adapter(%s) recv msg from: %s, type: %s", adapter->name,
+              header->sender, neu_reqresp_type_string(header->type));
 
     switch (header->type) {
     case NEU_REQ_UPDATE_LICENSE:

src/adapter/driver/driver.c

@@ -670,7 +670,7 @@ static void read_group(int64_t timestamp, int64_t timeout,
 
         if (neu_driver_cache_get(cache, group, tag->name, &value) != 0) {
             datas[index].value.type      = NEU_TYPE_ERROR;
-            datas[index].value.value.i32 = NEU_ERR_PLUGIN_READ_FAILURE;
+            datas[index].value.value.i32 = NEU_ERR_PLUGIN_TAG_NOT_READY;
             continue;
         }
 

src/connection/connection.c

@@ -698,6 +698,7 @@ static void conn_disconnect(neu_conn_t *conn)
         for (int i = 0; i < conn->param.params.tcp_server.max_link; i++) {
             if (conn->tcp_server.clients[i].fd > 0) {
                 close(conn->tcp_server.clients[i].fd);
+                conn->tcp_server.clients[i].fd = 0;
             }
         }
         break;
@@ -706,6 +707,7 @@ static void conn_disconnect(neu_conn_t *conn)
     case NEU_CONN_TTY_CLIENT:
         if (conn->fd > 0) {
             close(conn->fd);
+            conn->fd = 0;
         }
         break;
     }

src/core/manager.c

@@ -159,8 +159,8 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data)
 
     header = (neu_reqresp_head_t *) nng_msg_body(msg);
 
-    nlog_info("manager recv msg from: %s, type: %s", header->sender,
-              neu_reqresp_type_string(header->type));
+    nlog_info("manager recv msg from: %s to %s, type: %s", header->sender,
+              header->receiver, neu_reqresp_type_string(header->type));
     switch (header->type) {
     case NEU_REQRESP_TRANS_DATA: {
         neu_reqresp_trans_data_t *cmd = (neu_reqresp_trans_data_t *) &header[1];
@@ -510,8 +510,11 @@ inline static void reply(neu_manager_t *manager, neu_reqresp_head_t *header,
         neu_node_manager_get_pipe(manager->node_manager, header->receiver);
 
     nng_msg_set_pipe(msg, pipe);
+    int ret = nng_sendmsg(manager->socket, msg, 0);
 
-    if (nng_sendmsg(manager->socket, msg, 0) != 0) {
+    if (ret != 0) {
         nng_msg_free(msg);
+        nlog_warn("reply %s to %s, error: %d",
+                  neu_reqresp_type_string(header->type), header->receiver, ret);
     }
 }