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

revert: "feat(restful): update get nodes api with name_contains param"

Browse Source 
This reverts commit e1b67cf41c.
This commit is contained in:
eeff
2022-05-30 00:31:35 +08:00
parent 47acdd6d13
commit 48db032382
1 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/restful/adapter_handle.c
+9 -31
View File
@@ -18,7 +18,6 @@
**/
#include <stdlib.h>
#include <string.h>
#include "vector.h"
@@ -66,9 +65,8 @@ void handle_del_adapter(nng_aio *aio)
})
}
static void handle_get_adapter_by_id(nng_aio *aio, neu_node_id_t node_id,
neu_node_type_e node_type,
const char * node_name_substr)
static void handle_get_adapter_by_id(nng_aio *aio, neu_node_type_e node_type,
neu_node_id_t node_id)
{
int rv = 0;
neu_plugin_t * plugin = neu_rest_get_plugin();
@@ -81,10 +79,7 @@ static void handle_get_adapter_by_id(nng_aio *aio, neu_node_id_t node_id,
return;
}
if ((NEU_NODE_TYPE_MAX != node_type && node_type != node_info.node_type) ||
(NULL != node_name_substr &&
NULL == strstr(node_info.node_name, node_name_substr))) {
// `type` or `name_contains` param must comply when present
if (NEU_NODE_TYPE_MAX != node_type && node_type != node_info.node_type) {
NEU_JSON_RESPONSE_ERROR(NEU_ERR_NODE_NOT_EXIST, {
http_response(aio, error_code.error, result_error);
})
@@ -120,20 +115,14 @@ static void handle_get_adapter_by_id(nng_aio *aio, neu_node_id_t node_id,
void handle_get_adapter(nng_aio *aio)
{
neu_plugin_t * plugin = neu_rest_get_plugin();
char * result = NULL;
neu_node_type_e node_type = NEU_NODE_TYPE_MAX;
neu_node_id_t node_id = 0;
char name_substr[64] = {};
ssize_t name_substr_len = 0;
neu_plugin_t * plugin = neu_rest_get_plugin();
char * result = NULL;
neu_node_type_e node_type = NEU_NODE_TYPE_MAX;
neu_node_id_t node_id = 0;
VALIDATE_JWT(aio);
name_substr_len = http_get_param_str(aio, "name_contains", name_substr,
sizeof(name_substr));
if (-1 == name_substr_len || sizeof(name_substr) == name_substr_len ||
NEU_ERR_EINVAL == http_get_param_node_type(aio, "type", &node_type) ||
if (NEU_ERR_EINVAL == http_get_param_node_type(aio, "type", &node_type) ||
NEU_ERR_EINVAL == http_get_param_node_id(aio, "id", &node_id)) {
NEU_JSON_RESPONSE_ERROR(NEU_ERR_PARAM_IS_WRONG, {
http_response(aio, error_code.error, result_error);
@@ -142,14 +131,10 @@ void handle_get_adapter(nng_aio *aio)
}
if (0 != node_id) {
// `id` param presents, then filter by id
return handle_get_adapter_by_id(aio, node_id, node_type,
(-2 != name_substr_len) ? name_substr
: NULL);
return handle_get_adapter_by_id(aio, node_type, node_id);
}
if (NEU_NODE_TYPE_MAX == node_type) {
// `type` query param is required if `id` param not present
NEU_JSON_RESPONSE_ERROR(NEU_ERR_PARAM_IS_WRONG, {
http_response(aio, error_code.error, result_error);
})
@@ -168,18 +153,11 @@ void handle_get_adapter(nng_aio *aio)
{
neu_node_info_t *info = (neu_node_info_t *) iterator_get(&iter);
if (-2 != name_substr_len &&
NULL == strstr(info->node_name, name_substr)) {
// `name_contains` param presents, then filter by name sub string
continue;
}
nodes_res.nodes[index].id = info->node_id;
nodes_res.nodes[index].name = info->node_name;
nodes_res.nodes[index].plugin_id = info->plugin_id.id_val;
index += 1;
}
nodes_res.n_node = index;
neu_json_encode_by_fn(&nodes_res, neu_json_encode_get_nodes_resp, &result);