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

RPC: rename set_log_level to log_set_level 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 7c073fc7

doc/jsonrpc.md

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ Example response: 
    "clear_log_flag",

    "set_log_flag",

    "get_log_level",

    "set_log_level",

    "log_set_level",

    "log_get_print_level",

    "log_set_print_level",

    "get_iscsi_global_params",

lib/log_rpc/log_rpc.c

+3 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ SPDK_RPC_REGISTER("log_get_print_level", spdk_rpc_log_get_print_level, 
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,

spdk_rpc_log_set_level(struct spdk_jsonrpc_request *request,

		       const struct spdk_json_val *params)

{

	struct rpc_log_level req = {};
@@ -204,7 +204,8 @@ spdk_rpc_set_log_level(struct spdk_jsonrpc_request *request, 
invalid:

	free_rpc_log_level(&req);

}

SPDK_RPC_REGISTER("set_log_level", spdk_rpc_set_log_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("log_set_level", spdk_rpc_log_set_level, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_set_level, set_log_level)



static void

spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request,

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -1147,12 +1147,13 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p = subparsers.add_parser('get_log_flags', help='get log flags', aliases=['get_trace_flags'])

    p.set_defaults(func=get_log_flags)



    def set_log_level(args):

        rpc.log.set_log_level(args.client, level=args.level)

    def log_set_level(args):

        rpc.log.log_set_level(args.client, level=args.level)



    p = subparsers.add_parser('set_log_level', help='set log level')

    p = subparsers.add_parser('log_set_level', aliases=['set_log_level'],

                              help='set log level')

    p.add_argument('level', help='log level we want to set. (for example "DEBUG").')

    p.set_defaults(func=set_log_level)

    p.set_defaults(func=log_set_level)



    def get_log_level(args):

        print_dict(rpc.log.get_log_level(args.client))

scripts/rpc/client.py

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class JSONRPCClient(object): 
        ch.setLevel(logging.DEBUG)

        self._logger = logging.getLogger("JSONRPCClient(%s)" % addr)

        self._logger.addHandler(ch)

        self.set_log_level(kwargs.get('log_level', logging.ERROR))

        self.log_set_level(kwargs.get('log_level', logging.ERROR))



        self.timeout = timeout

        self._request_id = 0
@@ -69,7 +69,7 @@ class JSONRPCClient(object): 
    Args:

        lvl: Log level to set as accepted by logger.setLevel

    """

    def set_log_level(self, lvl):

    def log_set_level(self, lvl):

        self._logger.info("Setting log level to %s", lvl)

        self._logger.setLevel(lvl)

        self._logger.info("Log level set to %s", lvl)

scripts/rpc/log.py

+3 −2
Original line number Diff line number Diff line
@@ -33,14 +33,15 @@ def get_log_flags(client): 
    return client.call('get_log_flags')





def set_log_level(client, level):

@deprecated_alias('set_log_level')

def log_set_level(client, level):

    """Set log level.



    Args:

        level: log level we want to set. (for example "DEBUG")

    """

    params = {'level': level}

    return client.call('set_log_level', params)

    return client.call('log_set_level', params)





def get_log_level(client):