Commit ba735b42 authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Jim Harris
Browse files

RPC: rename get_log_level to log_get_level 



Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: If12f4f2ed91403a653a2951058d11109d17de8cd
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468692


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 2fd47b7d

doc/jsonrpc.md

+1 −1
Original line number Diff line number Diff line
@@ -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",

lib/log_rpc/log_rpc.c

+7 −6
Original line number Diff line number Diff line
@@ -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,

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -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)

scripts/rpc/log.py

+3 −2
Original line number Diff line number Diff line
@@ -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')