From 97806727b878d61de238b001b9775a958428a396 Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Sun, 13 Mar 2022 22:05:33 +0800 Subject: [PATCH 1/2] Add licensing error codes --- include/neu_errcodes.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/neu_errcodes.h b/include/neu_errcodes.h index 98230a62..5b08789e 100644 --- a/include/neu_errcodes.h +++ b/include/neu_errcodes.h @@ -94,6 +94,13 @@ typedef enum { NEU_ERR_LIBRARY_INFO_INVALID = 2302, NEU_ERR_LIBRARY_NAME_CONFLICT = 2303, + NEU_ERR_LICENSE_NOT_FOUND = 2400, + NEU_ERR_LICENSE_INVALID = 2401, + NEU_ERR_LICENSE_EXPIRED = 2402, + NEU_ERR_LICENSE_DISABLED = 2403, + NEU_ERR_LICENSE_MAX_NODES = 2404, + NEU_ERR_LICENSE_MAX_TAGS = 2405, + // common error codes for plugins NEU_ERR_PLUGIN_READ_FAILURE = 3000, NEU_ERR_PLUGIN_WRITE_FAILURE = 3001, From 02d90250b3614393838b31518db57b9ecbb4ff5d Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Mon, 14 Mar 2022 23:10:48 +0800 Subject: [PATCH 2/2] Handle license error codes in restful plugin --- plugins/restful/http.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/restful/http.c b/plugins/restful/http.c index a5182529..70c9ac05 100644 --- a/plugins/restful/http.c +++ b/plugins/restful/http.c @@ -262,6 +262,10 @@ int http_response(nng_aio *aio, neu_err_code_e code, char *content) case NEU_ERR_PLUGIN_TAG_NOT_ALLOW_WRITE: case NEU_ERR_PLUGIN_TAG_NOT_EXIST: case NEU_ERR_PLUGIN_GRP_NOT_SUBSCRIBE: + case NEU_ERR_LICENSE_EXPIRED: + case NEU_ERR_LICENSE_DISABLED: + case NEU_ERR_LICENSE_MAX_NODES: + case NEU_ERR_LICENSE_MAX_TAGS: status = NNG_HTTP_STATUS_OK; break; case NEU_ERR_EINTERNAL: @@ -282,12 +286,14 @@ int http_response(nng_aio *aio, neu_err_code_e code, char *content) case NEU_ERR_NODE_TYPE_INVALID: case NEU_ERR_NODE_SETTING_INVALID: case NEU_ERR_LIBRARY_INFO_INVALID: + case NEU_ERR_LICENSE_INVALID: status = NNG_HTTP_STATUS_BAD_REQUEST; break; case NEU_ERR_LIBRARY_NOT_FOUND: case NEU_ERR_NODE_NOT_EXIST: case NEU_ERR_GRP_CONFIG_NOT_EXIST: case NEU_ERR_TAG_NOT_EXIST: + case NEU_ERR_LICENSE_NOT_FOUND: status = NNG_HTTP_STATUS_NOT_FOUND; break; case NEU_ERR_NODE_EXIST: