From c7c2585f9617f55871a6de3538635f710273c3cc Mon Sep 17 00:00:00 2001 From: fengzero Date: Wed, 6 May 2026 05:45:33 +0000 Subject: [PATCH 1/7] branch v2.15 --- .github/workflows/check.yml | 18 +++++++++--------- .github/workflows/ci.yml | 8 ++++---- cmake/aarch64-linux-gnu.cmake | 2 +- cmake/arm-linux-gnueabi.cmake | 2 +- cmake/arm-linux-gnueabihf.cmake | 2 +- cmake/x86_64-linux-gnu.cmake | 2 +- include/neuron/define.h | 2 +- tests/ft/plugin/test_plugin.py | 2 +- tests/plugins/c1/c1_2.c | 2 +- version | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 92caf59c..488f7131 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -27,7 +27,7 @@ jobs: cppcheck: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.15 steps: - uses: actions/checkout@v4 @@ -42,7 +42,7 @@ jobs: build: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.15 steps: - uses: actions/checkout@v4 @@ -65,7 +65,7 @@ jobs: ut: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.15 needs: [build] steps: @@ -103,7 +103,7 @@ jobs: pft: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.15 needs: [build] strategy: matrix: @@ -169,7 +169,7 @@ jobs: pft_kafka: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-main + container: ghcr.io/neugates/build:x86_64-v2.15 needs: [build] services: kafka: @@ -212,13 +212,13 @@ jobs: - name: debug kafka plugin deps run: | echo "=== libs in staging prefix ===" - ls -la /home/neuron/main/libs/x86_64-linux-gnu/lib/librdkafka* || echo "no librdkafka" - ls -la /home/neuron/main/libs/x86_64-linux-gnu/lib/libzstd* || echo "no libzstd" - ls -la /home/neuron/main/libs/x86_64-linux-gnu/lib/libsasl2* || echo "no libsasl2" + ls -la /home/neuron/v2.15/libs/x86_64-linux-gnu/lib/librdkafka* || echo "no librdkafka" + ls -la /home/neuron/v2.15/libs/x86_64-linux-gnu/lib/libzstd* || echo "no libzstd" + ls -la /home/neuron/v2.15/libs/x86_64-linux-gnu/lib/libsasl2* || echo "no libsasl2" echo "=== libs in /usr/local/lib ===" ls -la /usr/local/lib/librdkafka* /usr/local/lib/libzstd* /usr/local/lib/libsasl2* 2>/dev/null || echo "none yet" echo "=== ldd librdkafka from staging ===" - ldd /home/neuron/main/libs/x86_64-linux-gnu/lib/librdkafka.so.1 || true + ldd /home/neuron/v2.15/libs/x86_64-linux-gnu/lib/librdkafka.so.1 || true echo "=== ldd plugin-kafka from build ===" chmod -R +x ./build/ 2>/dev/null || true ldd ./build/plugins/libplugin-kafka.so || true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd891c76..1bf09b43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,9 +8,9 @@ on: - published env: - VERSION: 2.14.0 + VERSION: 2.15.0 UI_VERSION: 2.6.1 - BRANCH: main + BRANCH: v2.15 jobs: cross-build: @@ -19,7 +19,7 @@ jobs: matrix: arch: - [x86_64-linux-gnu, x86_64, amd64] - container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main + container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.15 steps: - uses: actions/checkout@v4 @@ -62,7 +62,7 @@ jobs: matrix: arch: - [x86_64-linux-gnu, x86_64, amd64] - container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main + container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.15 steps: - uses: actions/checkout@v4 diff --git a/cmake/aarch64-linux-gnu.cmake b/cmake/aarch64-linux-gnu.cmake index cafc723a..d8840e94 100644 --- a/cmake/aarch64-linux-gnu.cmake +++ b/cmake/aarch64-linux-gnu.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(COMPILER_PREFIX aarch64-linux-gnu) set(CMAKE_SYSTEM_PROCESSOR aarch64) -set(LIBRARY_DIR /home/neuron/main/libs) +set(LIBRARY_DIR /home/neuron/v2.15/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/cmake/arm-linux-gnueabi.cmake b/cmake/arm-linux-gnueabi.cmake index 4fc7c43c..7634b9f0 100644 --- a/cmake/arm-linux-gnueabi.cmake +++ b/cmake/arm-linux-gnueabi.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(COMPILER_PREFIX arm-linux-gnueabi) set(CMAKE_SYSTEM_PROCESSOR armv5tejl) -set(LIBRARY_DIR /home/neuron/main/libs) +set(LIBRARY_DIR /home/neuron/v2.15/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/cmake/arm-linux-gnueabihf.cmake b/cmake/arm-linux-gnueabihf.cmake index d088767c..19b9ab7a 100644 --- a/cmake/arm-linux-gnueabihf.cmake +++ b/cmake/arm-linux-gnueabihf.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(COMPILER_PREFIX arm-linux-gnueabihf) set(CMAKE_SYSTEM_PROCESSOR armv7l) -set(LIBRARY_DIR /home/neuron/main/libs) +set(LIBRARY_DIR /home/neuron/v2.15/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/cmake/x86_64-linux-gnu.cmake b/cmake/x86_64-linux-gnu.cmake index 4c8ed6cf..f5d5d65e 100644 --- a/cmake/x86_64-linux-gnu.cmake +++ b/cmake/x86_64-linux-gnu.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(COMPILER_PREFIX x86_64-linux-gnu) set(CMAKE_SYSTEM_PROCESSOR x86_64) -set(LIBRARY_DIR /home/neuron/main/libs) +set(LIBRARY_DIR /home/neuron/v2.15/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/include/neuron/define.h b/include/neuron/define.h index fca9a891..c7f9f3ab 100644 --- a/include/neuron/define.h +++ b/include/neuron/define.h @@ -23,7 +23,7 @@ #include #define NEU_VERSION_MAJOR 2 -#define NEU_VERSION_MINOR 14 +#define NEU_VERSION_MINOR 15 #define NEU_VERSION_FIX 0 #define NEU_GET_VERSION_MAJOR(V) ((0xffff0000 & V) >> 16) diff --git a/tests/ft/plugin/test_plugin.py b/tests/ft/plugin/test_plugin.py index 78ffcb3e..df02df23 100644 --- a/tests/ft/plugin/test_plugin.py +++ b/tests/ft/plugin/test_plugin.py @@ -244,7 +244,7 @@ class TestPlugin: assert 200 == response.status_code for plugin in response.json().get("plugins"): if plugin['name'] == 'c1': - assert plugin['version'] == '2.14.99' + assert plugin['version'] == '2.15.99' @description(given="incorrect configuration", when="update plugin", then="fail") def test_10_update_plugin_fail3(self): diff --git a/tests/plugins/c1/c1_2.c b/tests/plugins/c1/c1_2.c index 13314c12..4b7f5900 100644 --- a/tests/plugins/c1/c1_2.c +++ b/tests/plugins/c1/c1_2.c @@ -63,7 +63,7 @@ static const neu_plugin_intf_funs_t plugin_intf_funs = { }; const neu_plugin_module_t neu_plugin_module = { - .version = NEU_VERSION(2, 14, 99), + .version = NEU_VERSION(2, 15, 99), .schema = "c1", .module_name = "c1", .module_descr = "c1 v2", diff --git a/version b/version index af819700..4219e56a 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.14.0-alpha \ No newline at end of file +2.15.0-beta1 From 3cb026191c206793d47e12c039b1203724a1e8cf Mon Sep 17 00:00:00 2001 From: fengzero Date: Mon, 11 May 2026 05:51:14 +0000 Subject: [PATCH 2/7] version: 2.15.0-beta2 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 4219e56a..5ef78766 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.15.0-beta1 +2.15.0-beta2 From 4518cb6fef3e8955d2e7374e8bdfbbef0ad66940 Mon Sep 17 00:00:00 2001 From: fengzero Date: Fri, 22 May 2026 06:12:04 +0000 Subject: [PATCH 3/7] rm unused log file api --- plugins/restful/log_handle.c | 118 ----------------------------------- plugins/restful/log_handle.h | 3 - 2 files changed, 121 deletions(-) diff --git a/plugins/restful/log_handle.c b/plugins/restful/log_handle.c index eb58d5fd..61347812 100644 --- a/plugins/restful/log_handle.c +++ b/plugins/restful/log_handle.c @@ -194,121 +194,3 @@ void handle_get_global_log_level(nng_aio *aio) neu_http_ok(aio, json_response); } - -void handle_log_list(nng_aio *aio) -{ - NEU_VALIDATE_JWT(aio); - - char log_dir[PATH_MAX] = { 0 }; - getcwd(log_dir, PATH_MAX - 1); - strncat(log_dir, "/", sizeof(log_dir) - strlen(log_dir) - 1); - strncat(log_dir, LOG_DIR, sizeof(log_dir) - strlen(log_dir) - 1); - DIR *dir = opendir(log_dir); - if (NULL == dir) { - NEU_JSON_RESPONSE_ERROR(NEU_ERR_FILE_NOT_EXIST, { - neu_http_response(aio, NEU_ERR_FILE_NOT_EXIST, result_error); - }); - } - - UT_icd icd = { sizeof(neu_resp_log_file_t), NULL, NULL, NULL }; - UT_array *log_files = NULL; - utarray_new(log_files, &icd); - - struct dirent *entry = NULL; - while (NULL != (entry = readdir(dir))) { - if (NULL == strstr(entry->d_name, ".log")) { - continue; - } - - char full_path[PATH_MAX] = { 0 }; - strncpy(full_path, log_dir, sizeof(full_path) - 1); - strncat(full_path, "/", sizeof(full_path) - strlen(full_path) - 1); - strncat(full_path, entry->d_name, - sizeof(full_path) - strlen(full_path) - 1); - struct stat st = { 0 }; - if (0 != stat(full_path, &st)) { - continue; - } - - neu_resp_log_file_t log_file = { 0 }; - strncpy(log_file.file, entry->d_name, sizeof(log_file.file) - 1); - log_file.size = st.st_size; - utarray_push_back(log_files, &log_file); - } - closedir(dir); - - char *result = NULL; - neu_json_encode_by_fn(log_files, neu_json_encode_log_list_resp, &result); - neu_http_ok(aio, result); - free(result); - utarray_free(log_files); -} - -static int response(nng_aio *aio, char *content, enum nng_http_status status) -{ - nng_http_res *res = NULL; - - nng_http_res_alloc(&res); - - nng_http_res_set_header(res, "Content-Type", "text/plain"); - nng_http_res_set_header(res, "Access-Control-Allow-Origin", "*"); - nng_http_res_set_header(res, "Access-Control-Allow-Methods", - "POST,GET,PUT,DELETE,OPTIONS"); - nng_http_res_set_header(res, "Access-Control-Allow-Headers", "*"); - - if (content != NULL && strlen(content) > 0) { - nng_http_res_copy_data(res, content, strlen(content)); - } - - nng_http_res_set_status(res, status); - - nng_http_req *nng_req = nng_aio_get_input(aio, 0); - nlog_notice("<%p> %s %s [%d]", aio, nng_http_req_get_method(nng_req), - nng_http_req_get_uri(nng_req), status); - - nng_aio_set_output(aio, 0, res); - nng_aio_finish(aio, 0); - - return 0; -} - -void handle_log_file(nng_aio *aio) -{ - NEU_VALIDATE_JWT(aio); - - char file_name[NEU_NODE_NAME_LEN] = { 0 }; - if (neu_http_get_param_str(aio, "name", file_name, sizeof(file_name)) <= - 0) { - NEU_JSON_RESPONSE_ERROR(NEU_ERR_PARAM_IS_WRONG, { - neu_http_response(aio, error_code.error, result_error); - }) - return; - } - - char path[PATH_MAX] = { 0 }; - getcwd(path, PATH_MAX - 1); - strncat(path, "/", sizeof(path) - strlen(path) - 1); - strncat(path, LOG_DIR, sizeof(path) - strlen(path) - 1); - - strncat(path, "/", sizeof(path) - strlen(path) - 1); - strncat(path, file_name, sizeof(path) - strlen(path) - 1); - - FILE *file = fopen(path, "r"); - if (NULL == file) { - NEU_JSON_RESPONSE_ERROR(NEU_ERR_FILE_NOT_EXIST, { - neu_http_response(aio, NEU_ERR_FILE_NOT_EXIST, result_error); - }); - } - - fseek(file, 0, SEEK_END); - long file_size = ftell(file); - fseek(file, 0, SEEK_SET); - - char *file_content = (char *) malloc(file_size + 1); - fread(file_content, 1, file_size, file); - file_content[file_size] = '\0'; - fclose(file); - - response(aio, file_content, NNG_HTTP_STATUS_OK); - free(file_content); -} diff --git a/plugins/restful/log_handle.h b/plugins/restful/log_handle.h index 1a9e2f44..0a1ce259 100644 --- a/plugins/restful/log_handle.h +++ b/plugins/restful/log_handle.h @@ -22,11 +22,8 @@ #include -// void handle_get_log(nng_aio *aio); void handle_log_level(nng_aio *aio); void handle_global_log_level(nng_aio *aio); void handle_get_global_log_level(nng_aio *aio); -void handle_log_list(nng_aio *aio); -void handle_log_file(nng_aio *aio); #endif From f996a36969174aa8fac7cdaa2371fad573c906ca Mon Sep 17 00:00:00 2001 From: fengzero Date: Fri, 22 May 2026 06:14:14 +0000 Subject: [PATCH 4/7] Revert "version: 2.15.0-beta2" This reverts commit 3cb026191c206793d47e12c039b1203724a1e8cf. --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 5ef78766..4219e56a 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.15.0-beta2 +2.15.0-beta1 From 1badb09d0bc2266bac31d0cc729b3c19da267071 Mon Sep 17 00:00:00 2001 From: fengzero Date: Fri, 22 May 2026 06:14:32 +0000 Subject: [PATCH 5/7] Revert "branch v2.15" This reverts commit c7c2585f9617f55871a6de3538635f710273c3cc. --- .github/workflows/check.yml | 18 +++++++++--------- .github/workflows/ci.yml | 8 ++++---- cmake/aarch64-linux-gnu.cmake | 2 +- cmake/arm-linux-gnueabi.cmake | 2 +- cmake/arm-linux-gnueabihf.cmake | 2 +- cmake/x86_64-linux-gnu.cmake | 2 +- include/neuron/define.h | 2 +- tests/ft/plugin/test_plugin.py | 2 +- tests/plugins/c1/c1_2.c | 2 +- version | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 488f7131..92caf59c 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -27,7 +27,7 @@ jobs: cppcheck: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-v2.15 + container: ghcr.io/neugates/build:x86_64-main steps: - uses: actions/checkout@v4 @@ -42,7 +42,7 @@ jobs: build: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-v2.15 + container: ghcr.io/neugates/build:x86_64-main steps: - uses: actions/checkout@v4 @@ -65,7 +65,7 @@ jobs: ut: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-v2.15 + container: ghcr.io/neugates/build:x86_64-main needs: [build] steps: @@ -103,7 +103,7 @@ jobs: pft: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-v2.15 + container: ghcr.io/neugates/build:x86_64-main needs: [build] strategy: matrix: @@ -169,7 +169,7 @@ jobs: pft_kafka: runs-on: ubuntu-24.04 - container: ghcr.io/neugates/build:x86_64-v2.15 + container: ghcr.io/neugates/build:x86_64-main needs: [build] services: kafka: @@ -212,13 +212,13 @@ jobs: - name: debug kafka plugin deps run: | echo "=== libs in staging prefix ===" - ls -la /home/neuron/v2.15/libs/x86_64-linux-gnu/lib/librdkafka* || echo "no librdkafka" - ls -la /home/neuron/v2.15/libs/x86_64-linux-gnu/lib/libzstd* || echo "no libzstd" - ls -la /home/neuron/v2.15/libs/x86_64-linux-gnu/lib/libsasl2* || echo "no libsasl2" + ls -la /home/neuron/main/libs/x86_64-linux-gnu/lib/librdkafka* || echo "no librdkafka" + ls -la /home/neuron/main/libs/x86_64-linux-gnu/lib/libzstd* || echo "no libzstd" + ls -la /home/neuron/main/libs/x86_64-linux-gnu/lib/libsasl2* || echo "no libsasl2" echo "=== libs in /usr/local/lib ===" ls -la /usr/local/lib/librdkafka* /usr/local/lib/libzstd* /usr/local/lib/libsasl2* 2>/dev/null || echo "none yet" echo "=== ldd librdkafka from staging ===" - ldd /home/neuron/v2.15/libs/x86_64-linux-gnu/lib/librdkafka.so.1 || true + ldd /home/neuron/main/libs/x86_64-linux-gnu/lib/librdkafka.so.1 || true echo "=== ldd plugin-kafka from build ===" chmod -R +x ./build/ 2>/dev/null || true ldd ./build/plugins/libplugin-kafka.so || true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1bf09b43..dd891c76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,9 +8,9 @@ on: - published env: - VERSION: 2.15.0 + VERSION: 2.14.0 UI_VERSION: 2.6.1 - BRANCH: v2.15 + BRANCH: main jobs: cross-build: @@ -19,7 +19,7 @@ jobs: matrix: arch: - [x86_64-linux-gnu, x86_64, amd64] - container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.15 + container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main steps: - uses: actions/checkout@v4 @@ -62,7 +62,7 @@ jobs: matrix: arch: - [x86_64-linux-gnu, x86_64, amd64] - container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-v2.15 + container: ghcr.io/neugates/build:${{ matrix.arch[1] }}-main steps: - uses: actions/checkout@v4 diff --git a/cmake/aarch64-linux-gnu.cmake b/cmake/aarch64-linux-gnu.cmake index d8840e94..cafc723a 100644 --- a/cmake/aarch64-linux-gnu.cmake +++ b/cmake/aarch64-linux-gnu.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(COMPILER_PREFIX aarch64-linux-gnu) set(CMAKE_SYSTEM_PROCESSOR aarch64) -set(LIBRARY_DIR /home/neuron/v2.15/libs) +set(LIBRARY_DIR /home/neuron/main/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/cmake/arm-linux-gnueabi.cmake b/cmake/arm-linux-gnueabi.cmake index 7634b9f0..4fc7c43c 100644 --- a/cmake/arm-linux-gnueabi.cmake +++ b/cmake/arm-linux-gnueabi.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(COMPILER_PREFIX arm-linux-gnueabi) set(CMAKE_SYSTEM_PROCESSOR armv5tejl) -set(LIBRARY_DIR /home/neuron/v2.15/libs) +set(LIBRARY_DIR /home/neuron/main/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/cmake/arm-linux-gnueabihf.cmake b/cmake/arm-linux-gnueabihf.cmake index 19b9ab7a..d088767c 100644 --- a/cmake/arm-linux-gnueabihf.cmake +++ b/cmake/arm-linux-gnueabihf.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(COMPILER_PREFIX arm-linux-gnueabihf) set(CMAKE_SYSTEM_PROCESSOR armv7l) -set(LIBRARY_DIR /home/neuron/v2.15/libs) +set(LIBRARY_DIR /home/neuron/main/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/cmake/x86_64-linux-gnu.cmake b/cmake/x86_64-linux-gnu.cmake index f5d5d65e..4c8ed6cf 100644 --- a/cmake/x86_64-linux-gnu.cmake +++ b/cmake/x86_64-linux-gnu.cmake @@ -1,7 +1,7 @@ set(CMAKE_SYSTEM_NAME Linux) set(COMPILER_PREFIX x86_64-linux-gnu) set(CMAKE_SYSTEM_PROCESSOR x86_64) -set(LIBRARY_DIR /home/neuron/v2.15/libs) +set(LIBRARY_DIR /home/neuron/main/libs) set(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc) set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++) diff --git a/include/neuron/define.h b/include/neuron/define.h index c7f9f3ab..fca9a891 100644 --- a/include/neuron/define.h +++ b/include/neuron/define.h @@ -23,7 +23,7 @@ #include #define NEU_VERSION_MAJOR 2 -#define NEU_VERSION_MINOR 15 +#define NEU_VERSION_MINOR 14 #define NEU_VERSION_FIX 0 #define NEU_GET_VERSION_MAJOR(V) ((0xffff0000 & V) >> 16) diff --git a/tests/ft/plugin/test_plugin.py b/tests/ft/plugin/test_plugin.py index df02df23..78ffcb3e 100644 --- a/tests/ft/plugin/test_plugin.py +++ b/tests/ft/plugin/test_plugin.py @@ -244,7 +244,7 @@ class TestPlugin: assert 200 == response.status_code for plugin in response.json().get("plugins"): if plugin['name'] == 'c1': - assert plugin['version'] == '2.15.99' + assert plugin['version'] == '2.14.99' @description(given="incorrect configuration", when="update plugin", then="fail") def test_10_update_plugin_fail3(self): diff --git a/tests/plugins/c1/c1_2.c b/tests/plugins/c1/c1_2.c index 4b7f5900..13314c12 100644 --- a/tests/plugins/c1/c1_2.c +++ b/tests/plugins/c1/c1_2.c @@ -63,7 +63,7 @@ static const neu_plugin_intf_funs_t plugin_intf_funs = { }; const neu_plugin_module_t neu_plugin_module = { - .version = NEU_VERSION(2, 15, 99), + .version = NEU_VERSION(2, 14, 99), .schema = "c1", .module_name = "c1", .module_descr = "c1 v2", diff --git a/version b/version index 4219e56a..af819700 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.15.0-beta1 +2.14.0-alpha \ No newline at end of file From ec959ab9cd5086a668bd4e7c1cb6ad77d0b9283a Mon Sep 17 00:00:00 2001 From: fengzero Date: Fri, 22 May 2026 06:15:23 +0000 Subject: [PATCH 6/7] rm unused log file api --- plugins/restful/handle.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/plugins/restful/handle.c b/plugins/restful/handle.c index d021db11..d81bf507 100644 --- a/plugins/restful/handle.c +++ b/plugins/restful/handle.c @@ -122,12 +122,6 @@ static struct neu_http_handler cors_handler[] = { { .url = "/api/v2/log/level", }, - { - .url = "/api/v2/log/list", - }, - { - .url = "/api/v2/log/file", - }, { .url = "/api/v2/global/config", }, @@ -495,18 +489,6 @@ static struct neu_http_handler rest_handlers[] = { .url = "/api/v2/log/global", .value.handler = handle_get_global_log_level, }, - { - .method = NEU_HTTP_METHOD_GET, - .type = NEU_HTTP_HANDLER_FUNCTION, - .url = "/api/v2/log/list", - .value.handler = handle_log_list, - }, - { - .method = NEU_HTTP_METHOD_GET, - .type = NEU_HTTP_HANDLER_FUNCTION, - .url = "/api/v2/log/file", - .value.handler = handle_log_file, - }, { .method = NEU_HTTP_METHOD_GET, .type = NEU_HTTP_HANDLER_FUNCTION, From d0a811d82e135ed7e98edd944958265efd5c55c7 Mon Sep 17 00:00:00 2001 From: fengzero Date: Fri, 22 May 2026 06:28:35 +0000 Subject: [PATCH 7/7] version: 2.15.0 --- .github/workflows/ci.yml | 2 +- include/neuron/define.h | 2 +- tests/ft/plugin/test_plugin.py | 2 +- tests/plugins/c1/c1_2.c | 2 +- version | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd891c76..be8073cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: - published env: - VERSION: 2.14.0 + VERSION: 2.15.0 UI_VERSION: 2.6.1 BRANCH: main diff --git a/include/neuron/define.h b/include/neuron/define.h index fca9a891..c7f9f3ab 100644 --- a/include/neuron/define.h +++ b/include/neuron/define.h @@ -23,7 +23,7 @@ #include #define NEU_VERSION_MAJOR 2 -#define NEU_VERSION_MINOR 14 +#define NEU_VERSION_MINOR 15 #define NEU_VERSION_FIX 0 #define NEU_GET_VERSION_MAJOR(V) ((0xffff0000 & V) >> 16) diff --git a/tests/ft/plugin/test_plugin.py b/tests/ft/plugin/test_plugin.py index 78ffcb3e..df02df23 100644 --- a/tests/ft/plugin/test_plugin.py +++ b/tests/ft/plugin/test_plugin.py @@ -244,7 +244,7 @@ class TestPlugin: assert 200 == response.status_code for plugin in response.json().get("plugins"): if plugin['name'] == 'c1': - assert plugin['version'] == '2.14.99' + assert plugin['version'] == '2.15.99' @description(given="incorrect configuration", when="update plugin", then="fail") def test_10_update_plugin_fail3(self): diff --git a/tests/plugins/c1/c1_2.c b/tests/plugins/c1/c1_2.c index 13314c12..4b7f5900 100644 --- a/tests/plugins/c1/c1_2.c +++ b/tests/plugins/c1/c1_2.c @@ -63,7 +63,7 @@ static const neu_plugin_intf_funs_t plugin_intf_funs = { }; const neu_plugin_module_t neu_plugin_module = { - .version = NEU_VERSION(2, 14, 99), + .version = NEU_VERSION(2, 15, 99), .schema = "c1", .module_name = "c1", .module_descr = "c1 v2", diff --git a/version b/version index af819700..68e69e40 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.14.0-alpha \ No newline at end of file +2.15.0