From f386909cd822c40cc098f2572899a9d452c7f283 Mon Sep 17 00:00:00 2001 From: Cunyin Chang Date: Tue, 21 Nov 2017 10:32:15 +0800 Subject: [PATCH] rpc/log: provide the rpc interface for set log level. Change-Id: I86bfeb20bcdb987012466a2b4a7555994a46e65e Signed-off-by: Cunyin Chang Reviewed-on: https://review.gerrithub.io/388340 Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Daniel Verkamp --- lib/log/rpc/log_rpc.c | 178 ++++++++++++++++++++++++++++++++++++++++++ scripts/rpc.py | 27 +++++++ 2 files changed, 205 insertions(+) diff --git a/lib/log/rpc/log_rpc.c b/lib/log/rpc/log_rpc.c index 5c035d8f6c..1a38dd362b 100644 --- a/lib/log/rpc/log_rpc.c +++ b/lib/log/rpc/log_rpc.c @@ -40,16 +40,194 @@ struct rpc_trace_flag { char *flag; }; +struct rpc_log_level { + char *level; +}; + static void free_rpc_trace_flag(struct rpc_trace_flag *p) { free(p->flag); } +static void +free_rpc_log_level(struct rpc_log_level *p) +{ + free(p->level); +} + static const struct spdk_json_object_decoder rpc_trace_flag_decoders[] = { {"flag", offsetof(struct rpc_trace_flag, flag), spdk_json_decode_string}, }; +static const struct spdk_json_object_decoder rpc_log_level_decoders[] = { + {"level", offsetof(struct rpc_log_level, level), spdk_json_decode_string}, +}; + +static int +_parse_log_level(char *level) +{ + if (!strcasecmp(level, "ERROR")) { + return SPDK_LOG_ERROR; + } else if (!strcasecmp(level, "WARNING")) { + return SPDK_LOG_WARN; + } else if (!strcasecmp(level, "NOTICE")) { + return SPDK_LOG_NOTICE; + } else if (!strcasecmp(level, "INFO")) { + return SPDK_LOG_INFO; + } else if (!strcasecmp(level, "DEBUG")) { + return SPDK_LOG_DEBUG; + } + return -1; +} + +static void +spdk_rpc_set_log_print_level(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) +{ + struct rpc_log_level req = {}; + int level; + struct spdk_json_write_ctx *w; + + if (spdk_json_decode_object(params, rpc_log_level_decoders, + SPDK_COUNTOF(rpc_log_level_decoders), &req)) { + SPDK_DEBUGLOG(SPDK_TRACE_LOG, "spdk_json_decode_object failed\n"); + goto invalid; + } + + level = _parse_log_level(req.level); + if (level == -1) { + SPDK_DEBUGLOG(SPDK_TRACE_LOG, "try to set invalid log level\n"); + goto invalid; + } + + spdk_log_set_print_level(level); + free_rpc_log_level(&req); + + w = spdk_jsonrpc_begin_result(request); + if (w == NULL) { + return; + } + + spdk_json_write_bool(w, true); + spdk_jsonrpc_end_result(request, w); + return; + +invalid: + spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); + free_rpc_log_level(&req); +} +SPDK_RPC_REGISTER("set_log_print_level", spdk_rpc_set_log_print_level) + +static void +spdk_rpc_get_log_print_level(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) +{ + struct spdk_json_write_ctx *w; + int level; + + if (params != NULL) { + spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, + "get_trace_flags requires no parameters"); + return; + } + + w = spdk_jsonrpc_begin_result(request); + if (w == NULL) { + return; + } + + level = spdk_log_get_print_level(); + + if (level == SPDK_LOG_ERROR) + spdk_json_write_string(w, "ERROR"); + if (level == SPDK_LOG_WARN) + spdk_json_write_string(w, "WARNING"); + if (level == SPDK_LOG_NOTICE) + spdk_json_write_string(w, "NOTICE"); + if (level == SPDK_LOG_INFO) + spdk_json_write_string(w, "INFO"); + if (level == SPDK_LOG_DEBUG) + spdk_json_write_string(w, "DEBUG"); + + spdk_jsonrpc_end_result(request, w); +} +SPDK_RPC_REGISTER("get_log_print_level", spdk_rpc_get_log_print_level) + +static void +spdk_rpc_set_log_level(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) +{ + struct rpc_log_level req = {}; + int level; + struct spdk_json_write_ctx *w; + + if (spdk_json_decode_object(params, rpc_log_level_decoders, + SPDK_COUNTOF(rpc_log_level_decoders), &req)) { + SPDK_DEBUGLOG(SPDK_TRACE_LOG, "spdk_json_decode_object failed\n"); + goto invalid; + } + + level = _parse_log_level(req.level); + if (level == -1) { + SPDK_DEBUGLOG(SPDK_TRACE_LOG, "try to set invalid log level\n"); + goto invalid; + } + + + spdk_log_set_level(level); + free_rpc_log_level(&req); + + w = spdk_jsonrpc_begin_result(request); + if (w == NULL) { + return; + } + + spdk_json_write_bool(w, true); + spdk_jsonrpc_end_result(request, w); + return; + +invalid: + spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); + free_rpc_log_level(&req); +} +SPDK_RPC_REGISTER("set_log_level", spdk_rpc_set_log_level) + +static void +spdk_rpc_get_log_level(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) +{ + struct spdk_json_write_ctx *w; + int level; + + if (params != NULL) { + spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, + "get_trace_flags requires no parameters"); + return; + } + + w = spdk_jsonrpc_begin_result(request); + if (w == NULL) { + return; + } + + level = spdk_log_get_level(); + + if (level == SPDK_LOG_ERROR) + spdk_json_write_string(w, "ERROR"); + if (level == SPDK_LOG_WARN) + spdk_json_write_string(w, "WARNING"); + if (level == SPDK_LOG_NOTICE) + spdk_json_write_string(w, "NOTICE"); + if (level == SPDK_LOG_INFO) + spdk_json_write_string(w, "INFO"); + if (level == SPDK_LOG_DEBUG) + spdk_json_write_string(w, "DEBUG"); + + spdk_jsonrpc_end_result(request, w); +} +SPDK_RPC_REGISTER("get_log_level", spdk_rpc_get_log_level) + static void spdk_rpc_set_trace_flag(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params) diff --git a/scripts/rpc.py b/scripts/rpc.py index 883fa1ffb0..21fbfa7f73 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -387,6 +387,33 @@ def get_trace_flags(args): p = subparsers.add_parser('get_trace_flags', help='get trace flags') p.set_defaults(func=get_trace_flags) +def set_log_level(args): + params = {'level': args.level} + jsonrpc_call('set_log_level', params) + +p = subparsers.add_parser('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) + +def get_log_level(args): + print_dict(jsonrpc_call('get_log_level')) + +p = subparsers.add_parser('get_log_level', help='get log level') +p.set_defaults(func=get_log_level) + +def set_log_print_level(args): + params = {'level': args.level} + jsonrpc_call('set_log_print_level', params) + +p = subparsers.add_parser('set_log_print_level', help='set log print level') +p.add_argument('level', help='log print level we want to set. (for example "DEBUG").') +p.set_defaults(func=set_log_print_level) + +def get_log_print_level(args): + print_dict(jsonrpc_call('get_log_print_level')) + +p = subparsers.add_parser('get_log_print_level', help='get log print level') +p.set_defaults(func=get_log_print_level) def add_portal_group(args): # parse out portal list host1:port1 host2:port2