From ba735b4221609f527098fcd89c53fc147d820773 Mon Sep 17 00:00:00 2001 From: Maciej Wawryk Date: Wed, 18 Sep 2019 13:21:23 +0200 Subject: [PATCH] RPC: rename get_log_level to log_get_level Signed-off-by: Maciej Wawryk Change-Id: If12f4f2ed91403a653a2951058d11109d17de8cd Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468692 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- doc/jsonrpc.md | 2 +- lib/log_rpc/log_rpc.c | 13 +++++++------ scripts/rpc.py | 9 +++++---- scripts/rpc/log.py | 5 +++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index 4b0e4e9b2..8c9a970e1 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -250,7 +250,7 @@ Example response: "get_log_flags", "clear_log_flag", "set_log_flag", - "get_log_level", + "log_get_level", "log_set_level", "log_get_print_level", "log_set_print_level", diff --git a/lib/log_rpc/log_rpc.c b/lib/log_rpc/log_rpc.c index 12da8cb9d..68a29dadb 100644 --- a/lib/log_rpc/log_rpc.c +++ b/lib/log_rpc/log_rpc.c @@ -82,7 +82,7 @@ _parse_log_level(char *level) } static const char * -_get_log_level_name(int level) +_log_get_level_name(int level) { if (level == SPDK_LOG_ERROR) { return "ERROR"; @@ -152,7 +152,7 @@ spdk_rpc_log_get_print_level(struct spdk_jsonrpc_request *request, } level = spdk_log_get_print_level(); - name = _get_log_level_name(level); + name = _log_get_level_name(level); if (name == NULL) { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, "invalid log level"); @@ -208,7 +208,7 @@ SPDK_RPC_REGISTER("log_set_level", spdk_rpc_log_set_level, SPDK_RPC_STARTUP | SP SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_set_level, set_log_level) static void -spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request, +spdk_rpc_log_get_level(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct spdk_json_write_ctx *w; @@ -217,12 +217,12 @@ spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request, if (params != NULL) { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, - "get_log_level requires no parameters"); + "log_get_level requires no parameters"); return; } level = spdk_log_get_level(); - name = _get_log_level_name(level); + name = _log_get_level_name(level); if (name == NULL) { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, "invalid log level"); @@ -234,7 +234,8 @@ spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } -SPDK_RPC_REGISTER("get_log_level", spdk_rpc_get_log_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER("log_get_level", spdk_rpc_log_get_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_get_level, get_log_level) static void spdk_rpc_set_log_flag(struct spdk_jsonrpc_request *request, diff --git a/scripts/rpc.py b/scripts/rpc.py index d840cbfd8..a5b0fe084 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1155,11 +1155,12 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse p.add_argument('level', help='log level we want to set. (for example "DEBUG").') p.set_defaults(func=log_set_level) - def get_log_level(args): - print_dict(rpc.log.get_log_level(args.client)) + def log_get_level(args): + print_dict(rpc.log.log_get_level(args.client)) - p = subparsers.add_parser('get_log_level', help='get log level') - p.set_defaults(func=get_log_level) + p = subparsers.add_parser('log_get_level', aliases=['get_log_level'], + help='get log level') + p.set_defaults(func=log_get_level) def log_set_print_level(args): rpc.log.log_set_print_level(args.client, level=args.level) diff --git a/scripts/rpc/log.py b/scripts/rpc/log.py index 89027576e..04744a688 100644 --- a/scripts/rpc/log.py +++ b/scripts/rpc/log.py @@ -44,13 +44,14 @@ def log_set_level(client, level): return client.call('log_set_level', params) -def get_log_level(client): +@deprecated_alias('get_log_level') +def log_get_level(client): """Get log level Returns: Current log level """ - return client.call('get_log_level') + return client.call('log_get_level') @deprecated_alias('set_log_print_level')