GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-17 04:40:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2111 from ZhouBox/v2.7

Browse Source 
[v2.7]add notice log about node,group,sub
This commit is contained in:
fengzeroz
2024-06-21 10:09:41 +08:00
committed by GitHub
parent 7a9d805bb2 66e86106a9
commit ea48aa4dc4
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/adapter/adapter.c
+8 -4
View File
@@ -810,7 +810,7 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
case NEU_REQ_NODE_SETTING: {
neu_req_node_setting_t *cmd = (neu_req_node_setting_t *) &header[1];
neu_resp_error_t error = { 0 };
nlog_notice("setting node:%s params:%s", cmd->node, cmd->setting);
error.error = neu_adapter_set_setting(adapter, cmd->setting);
if (error.error == NEU_ERR_SUCCESS) {
adapter_storage_setting(adapter->name, cmd->setting);
@@ -903,7 +903,8 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
case NEU_REQ_ADD_GROUP: {
neu_req_add_group_t *cmd = (neu_req_add_group_t *) &header[1];
neu_resp_error_t error = { 0 };
nlog_notice("add group node:%s group:%s interval:%d", cmd->driver,
cmd->group, cmd->interval);
if (cmd->interval < NEU_GROUP_INTERVAL_LIMIT) {
error.error = NEU_ERR_GROUP_PARAMETER_INVALID;
} else {
@@ -928,7 +929,8 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
case NEU_REQ_UPDATE_DRIVER_GROUP: {
neu_req_update_group_t *cmd = (neu_req_update_group_t *) &header[1];
neu_resp_update_group_t resp = { 0 };
nlog_notice("update group node:%s old_name:%s new_name:%s interval:%d",
header->receiver, cmd->group, cmd->new_name, cmd->interval);
if (adapter->module->type == NEU_NA_TYPE_DRIVER) {
resp.error = neu_adapter_driver_update_group(
(neu_adapter_driver_t *) adapter, cmd->group, cmd->new_name,
@@ -953,7 +955,7 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
case NEU_REQ_DEL_GROUP: {
neu_req_del_group_t *cmd = (neu_req_del_group_t *) &header[1];
neu_resp_error_t error = { 0 };
nlog_notice("del group node:%s group:%s", cmd->driver, cmd->group);
if (adapter->module->type == NEU_NA_TYPE_DRIVER) {
error.error = neu_adapter_driver_del_group(
(neu_adapter_driver_t *) adapter, cmd->group);
@@ -1009,6 +1011,8 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
if (adapter->module->type == NEU_NA_TYPE_DRIVER) {
for (int i = 0; i < cmd->n_tag; i++) {
nlog_notice("del tag node:%s group:%s tag:%s", cmd->driver,
cmd->group, cmd->tags[i]);
int ret = neu_adapter_driver_del_tag(
(neu_adapter_driver_t *) adapter, cmd->group, cmd->tags[i]);
if (0 == ret) {
src/core/manager.c
+17 -5
View File
@@ -965,6 +965,7 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data)
}
case NEU_REQ_ADD_NODE: {
neu_req_add_node_t *cmd = (neu_req_add_node_t *) &header[1];
nlog_notice("add node name:%s plugin:%s", cmd->node, cmd->plugin);
int error = neu_manager_add_node(manager, cmd->node, cmd->plugin,
NEU_NODE_RUNNING_STATE_INIT, false);
neu_resp_error_t e = { .error = error };
@@ -981,7 +982,8 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data)
case NEU_REQ_UPDATE_NODE: {
neu_req_update_node_t *cmd = (neu_req_update_node_t *) &header[1];
neu_resp_error_t e = { 0 };
nlog_notice("update node name:%s new_name:%s", cmd->node,
cmd->new_name);
if (NULL == neu_node_manager_find(manager->node_manager, cmd->node)) {
e.error = NEU_ERR_NODE_NOT_EXIST;
} else if (NULL !=
@@ -1005,7 +1007,8 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data)
case NEU_REQ_DEL_NODE: {
neu_req_del_node_t *cmd = (neu_req_del_node_t *) &header[1];
neu_resp_error_t error = { 0 };
neu_adapter_t * adapter =
nlog_notice("del node name:%s", cmd->node);
neu_adapter_t *adapter =
neu_node_manager_find(manager->node_manager, cmd->node);
bool single =
neu_node_manager_is_single(manager->node_manager, cmd->node);
@@ -1103,6 +1106,10 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data)
neu_resp_error_t error = { 0 };
uint16_t app_port = 0;
nlog_notice("add sub app_name:%s driver_node:%s group:%s params:%s",
cmd->app, cmd->driver, cmd->group,
cmd->params != NULL ? cmd->params : "");
error.error = neu_manager_subscribe(manager, cmd->app, cmd->driver,
cmd->group, cmd->params, &app_port);
@@ -1128,7 +1135,9 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data)
for (uint16_t i = 0; i < cmd->n_group; ++i) {
neu_req_subscribe_group_info_t *info = &cmd->groups[i];
nlog_notice("add sub app_name:%s driver_node:%s group:%s params:%s",
cmd->app, info->driver, info->group,
info->params != NULL ? info->params : "");
error.error =
neu_manager_subscribe(manager, cmd->app, info->driver,
info->group, info->params, &info->port);
@@ -1156,7 +1165,9 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data)
case NEU_REQ_UPDATE_SUBSCRIBE_GROUP: {
neu_req_subscribe_t *cmd = (neu_req_subscribe_t *) &header[1];
neu_resp_error_t error = { 0 };
nlog_notice("update sub app_name:%s driver_node:%s group:%s params:%s",
cmd->app, cmd->driver, cmd->group,
cmd->params != NULL ? cmd->params : "");
error.error = neu_manager_update_subscribe(
manager, cmd->app, cmd->driver, cmd->group, cmd->params);
@@ -1176,7 +1187,8 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data)
case NEU_REQ_UNSUBSCRIBE_GROUP: {
neu_req_unsubscribe_t *cmd = (neu_req_unsubscribe_t *) &header[1];
neu_resp_error_t error = { 0 };
nlog_notice("del sub app_name:%s driver_node:%s group:%s", cmd->app,
cmd->driver, cmd->group);
error.error =
neu_manager_unsubscribe(manager, cmd->app, cmd->driver, cmd->group);