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 #2687 from fengzeroz/main

Browse Source 
fix: import apps crash
This commit is contained in:
fengzeroz
2026-01-29 16:07:43 +08:00
committed by GitHub
parent 4533901078 c9bae5e737
commit 3dee50ddeb
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/restful/global_config_handle.c
+27 -4
View File
@@ -60,6 +60,7 @@ typedef enum {
STATE_DEL_APP,
STATE_DEL_DRIVER,
STATE_ADD_NODE,
STATE_UPDATE_DEFAULT_APP_TAGS,
STATE_ADD_GROUP,
STATE_ADD_TAG,
STATE_GET_APP_SUBS,
@@ -745,6 +746,28 @@ static void put_apps_context_next(context_t *ctx, neu_reqresp_type_e type,
}
// After adding nodes, get subscriptions for default apps to unsub
ctx->idx = 0;
ctx->unsub_idx = 0;
ctx->state = STATE_UPDATE_DEFAULT_APP_TAGS;
}
// fall through
case STATE_UPDATE_DEFAULT_APP_TAGS: {
neu_resp_error_t * err = data;
neu_json_apps_req_t *apps = ctx->apps_req;
if (ctx->idx > 0 && 0 != err->error) {
ctx->error = err->error;
ctx->state = STATE_END;
break;
}
for (; ctx->idx < (size_t) apps->n_app; ++ctx->idx) {
neu_json_app_t *app = &apps->apps[ctx->idx];
NEXT(ctx, add_app_tags, app);
++ctx->idx;
goto done;
}
ctx->idx = 0;
ctx->unsub_idx = 0;
ctx->state = STATE_GET_APP_SUBS;
@@ -1789,12 +1812,12 @@ static int add_app_node(context_t *ctx, neu_json_app_t *app)
static int add_app_tags(context_t *ctx, neu_json_app_t *app)
{
int ret = 0;
neu_plugin_t *plugin = neu_rest_get_plugin();
neu_reqresp_head_t header = {
.type = NEU_REQ_UPDATE_NODE_TAG,
.ctx = ctx->aio,
.otel_trace_type = NEU_OTEL_TRACE_TYPE_REST_COMM,
.type = NEU_REQ_UPDATE_NODE_TAG,
.ctx = ctx->aio,
};
neu_req_update_node_tag_t cmd = { 0 };
@@ -1807,7 +1830,7 @@ static int add_app_tags(context_t *ctx, neu_json_app_t *app)
return NEU_ERR_IS_BUSY;
}
return ret;
return 0;
}
static int add_app_setting(context_t *ctx, neu_json_app_t *app)
tests/ft/app/test_apps_export_import.py
+5 -2
View File
@@ -75,7 +75,8 @@ class TestAppsExportImport:
"port": 1883,
"ssl": False
},
"groups": []
"groups": [],
"tags": ""
}]
response = api.put_apps(apps)
@@ -114,7 +115,8 @@ class TestAppsExportImport:
"port": 1883,
"ssl": False
},
"groups": []
"groups": [],
"tags": ""
}]
response = api.put_apps(apps)
@@ -157,6 +159,7 @@ class TestAppsExportImport:
"port": 1883,
"ssl": False
},
"tags": "",
"groups": [{
"driver": non_exist_driver,
"group": "group1"