diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index 832050d9a..357c5ff44 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -252,7 +252,7 @@ Example response: "set_log_flag", "get_log_level", "set_log_level", - "get_log_print_level", + "log_get_print_level", "log_set_print_level", "get_iscsi_global_params", "iscsi_target_node_add_lun", diff --git a/lib/log_rpc/log_rpc.c b/lib/log_rpc/log_rpc.c index fa1381033..3f830c03c 100644 --- a/lib/log_rpc/log_rpc.c +++ b/lib/log_rpc/log_rpc.c @@ -138,7 +138,7 @@ SPDK_RPC_REGISTER("log_set_print_level", spdk_rpc_log_set_print_level, SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_set_print_level, set_log_print_level) static void -spdk_rpc_get_log_print_level(struct spdk_jsonrpc_request *request, +spdk_rpc_log_get_print_level(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) { struct spdk_json_write_ctx *w; @@ -147,7 +147,7 @@ spdk_rpc_get_log_print_level(struct spdk_jsonrpc_request *request, if (params != NULL) { spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, - "get_log_print_level requires no parameters"); + "log_get_print_level requires no parameters"); return; } @@ -164,8 +164,9 @@ spdk_rpc_get_log_print_level(struct spdk_jsonrpc_request *request, spdk_jsonrpc_end_result(request, w); } -SPDK_RPC_REGISTER("get_log_print_level", spdk_rpc_get_log_print_level, +SPDK_RPC_REGISTER("log_get_print_level", spdk_rpc_log_get_print_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) +SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_get_print_level, get_log_print_level) static void spdk_rpc_set_log_level(struct spdk_jsonrpc_request *request, diff --git a/scripts/rpc.py b/scripts/rpc.py index be9bf834b..e20ae09d4 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -1168,11 +1168,12 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse p.add_argument('level', help='log print level we want to set. (for example "DEBUG").') p.set_defaults(func=log_set_print_level) - def get_log_print_level(args): - print_dict(rpc.log.get_log_print_level(args.client)) + def log_get_print_level(args): + print_dict(rpc.log.log_get_print_level(args.client)) - p = subparsers.add_parser('get_log_print_level', help='get log print level') - p.set_defaults(func=get_log_print_level) + p = subparsers.add_parser('log_get_print_level', aliases=['get_log_print_level'], + help='get log print level') + p.set_defaults(func=log_get_print_level) # lvol def bdev_lvol_create_lvstore(args): diff --git a/scripts/rpc/log.py b/scripts/rpc/log.py index c9427bf97..319380063 100644 --- a/scripts/rpc/log.py +++ b/scripts/rpc/log.py @@ -63,10 +63,11 @@ def log_set_print_level(client, level): return client.call('log_set_print_level', params) -def get_log_print_level(client): +@deprecated_alias('get_log_print_level') +def log_get_print_level(client): """Get log print level Returns: Current log print level """ - return client.call('get_log_print_level') + return client.call('log_get_print_level')