ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RPC: rename get_log_level to log_get_level

Browse Source 
Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: If12f4f2ed91403a653a2951058d11109d17de8cd
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468692
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Maciej Wawryk 2019-09-18 13:21:23 +02:00 committed by Jim Harris
parent 2fd47b7d1a
commit ba735b4221
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/jsonrpc.md
View File

@ -250,7 +250,7 @@ Example response:
"get_log_flags", "get_log_flags",
"clear_log_flag", "clear_log_flag",
"set_log_flag", "set_log_flag",
"get_log_level", "log_get_level",
"log_set_level", "log_set_level",
"log_get_print_level", "log_get_print_level",
"log_set_print_level", "log_set_print_level",

13
lib/log_rpc/log_rpc.c
View File

@ -82,7 +82,7 @@ _parse_log_level(char *level)
} }
static const char * static const char *
_get_log_level_name(int level) _log_get_level_name(int level)
{ {
if (level == SPDK_LOG_ERROR) { if (level == SPDK_LOG_ERROR) {
return "ERROR"; return "ERROR";
@ -152,7 +152,7 @@ spdk_rpc_log_get_print_level(struct spdk_jsonrpc_request *request,
} }
level = spdk_log_get_print_level(); level = spdk_log_get_print_level();
name = _get_log_level_name(level); name = _log_get_level_name(level);
if (name == NULL) { if (name == NULL) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"invalid log level"); "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) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_set_level, set_log_level)
static void 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) const struct spdk_json_val *params)
{ {
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
@ -217,12 +217,12 @@ spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request,
if (params != NULL) { if (params != NULL) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
"get_log_level requires no parameters"); "log_get_level requires no parameters");
return; return;
} }
level = spdk_log_get_level(); level = spdk_log_get_level();
name = _get_log_level_name(level); name = _log_get_level_name(level);
if (name == NULL) { if (name == NULL) {
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"invalid log level"); "invalid log level");
@ -234,7 +234,8 @@ spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request,
spdk_jsonrpc_end_result(request, w); 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 static void
spdk_rpc_set_log_flag(struct spdk_jsonrpc_request *request, spdk_rpc_set_log_flag(struct spdk_jsonrpc_request *request,

9
scripts/rpc.py
View File

@ -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.add_argument('level', help='log level we want to set. (for example "DEBUG").')
p.set_defaults(func=log_set_level) p.set_defaults(func=log_set_level)
def get_log_level(args): def log_get_level(args):
print_dict(rpc.log.get_log_level(args.client)) print_dict(rpc.log.log_get_level(args.client))
p = subparsers.add_parser('get_log_level', help='get log level') p = subparsers.add_parser('log_get_level', aliases=['get_log_level'],
p.set_defaults(func=get_log_level) help='get log level')
p.set_defaults(func=log_get_level)
def log_set_print_level(args): def log_set_print_level(args):
rpc.log.log_set_print_level(args.client, level=args.level) rpc.log.log_set_print_level(args.client, level=args.level)

5
scripts/rpc/log.py
View File

@ -44,13 +44,14 @@ def log_set_level(client, level):
return client.call('log_set_level', params) 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 """Get log level
Returns: Returns:
Current log level Current log level
""" """
return client.call('get_log_level') return client.call('log_get_level')
@deprecated_alias('set_log_print_level') @deprecated_alias('set_log_print_level')