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

lib/logrpc: create a new log flag.

Browse Source 
The log_rpc library should have its own flag.

Signed-off-by: Seth Howell <seth.howell@intel.com>
Change-Id: I7cfe4c9136089e83bdf2730c727a6602ffbaf83e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2215
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Seth Howell 2020-05-06 15:17:17 -07:00 committed by Tomasz Zawadzki
parent 134590a206
commit ed0e32a17a
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/log_rpc/log_rpc.c
View File

@ -108,7 +108,7 @@ spdk_rpc_log_set_print_level(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_log_level_decoders, if (spdk_json_decode_object(params, rpc_log_level_decoders,
SPDK_COUNTOF(rpc_log_level_decoders), &req)) { SPDK_COUNTOF(rpc_log_level_decoders), &req)) {
SPDK_DEBUGLOG(SPDK_LOG_LOG, "spdk_json_decode_object failed\n"); SPDK_DEBUGLOG(SPDK_LOG_LOG_RPC, "spdk_json_decode_object failed\n");
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"spdk_json_decode_object failed"); "spdk_json_decode_object failed");
goto invalid; goto invalid;
@ -116,7 +116,7 @@ spdk_rpc_log_set_print_level(struct spdk_jsonrpc_request *request,
level = _parse_log_level(req.level); level = _parse_log_level(req.level);
if (level == -1) { if (level == -1) {
SPDK_DEBUGLOG(SPDK_LOG_LOG, "tried to set invalid log level\n"); SPDK_DEBUGLOG(SPDK_LOG_LOG_RPC, "tried to set invalid log level\n");
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
"invalid log level"); "invalid log level");
goto invalid; goto invalid;
@ -178,7 +178,7 @@ spdk_rpc_log_set_level(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_log_level_decoders, if (spdk_json_decode_object(params, rpc_log_level_decoders,
SPDK_COUNTOF(rpc_log_level_decoders), &req)) { SPDK_COUNTOF(rpc_log_level_decoders), &req)) {
SPDK_DEBUGLOG(SPDK_LOG_LOG, "spdk_json_decode_object failed\n"); SPDK_DEBUGLOG(SPDK_LOG_LOG_RPC, "spdk_json_decode_object failed\n");
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"spdk_json_decode_object failed"); "spdk_json_decode_object failed");
goto invalid; goto invalid;
@ -186,7 +186,7 @@ spdk_rpc_log_set_level(struct spdk_jsonrpc_request *request,
level = _parse_log_level(req.level); level = _parse_log_level(req.level);
if (level == -1) { if (level == -1) {
SPDK_DEBUGLOG(SPDK_LOG_LOG, "tried to set invalid log level\n"); SPDK_DEBUGLOG(SPDK_LOG_LOG_RPC, "tried to set invalid log level\n");
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
"invalid log level"); "invalid log level");
goto invalid; goto invalid;
@ -246,14 +246,14 @@ spdk_rpc_log_set_flag(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_log_flag_decoders, if (spdk_json_decode_object(params, rpc_log_flag_decoders,
SPDK_COUNTOF(rpc_log_flag_decoders), &req)) { SPDK_COUNTOF(rpc_log_flag_decoders), &req)) {
SPDK_DEBUGLOG(SPDK_LOG_LOG, "spdk_json_decode_object failed\n"); SPDK_DEBUGLOG(SPDK_LOG_LOG_RPC, "spdk_json_decode_object failed\n");
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"spdk_json_decode_object failed"); "spdk_json_decode_object failed");
goto invalid; goto invalid;
} }
if (req.flag == 0) { if (req.flag == 0) {
SPDK_DEBUGLOG(SPDK_LOG_LOG, "invalid flag 0\n"); SPDK_DEBUGLOG(SPDK_LOG_LOG_RPC, "invalid flag 0\n");
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
"invalid flag 0"); "invalid flag 0");
goto invalid; goto invalid;
@ -282,14 +282,14 @@ spdk_rpc_log_clear_flag(struct spdk_jsonrpc_request *request,
if (spdk_json_decode_object(params, rpc_log_flag_decoders, if (spdk_json_decode_object(params, rpc_log_flag_decoders,
SPDK_COUNTOF(rpc_log_flag_decoders), &req)) { SPDK_COUNTOF(rpc_log_flag_decoders), &req)) {
SPDK_DEBUGLOG(SPDK_LOG_LOG, "spdk_json_decode_object failed\n"); SPDK_DEBUGLOG(SPDK_LOG_LOG_RPC, "spdk_json_decode_object failed\n");
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,
"spdk_json_decode_object failed"); "spdk_json_decode_object failed");
goto invalid; goto invalid;
} }
if (req.flag == 0) { if (req.flag == 0) {
SPDK_DEBUGLOG(SPDK_LOG_LOG, "Invalid flag 0\n"); SPDK_DEBUGLOG(SPDK_LOG_LOG_RPC, "Invalid flag 0\n");
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
"invalid flag 0"); "invalid flag 0");
goto invalid; goto invalid;
@ -336,3 +336,5 @@ spdk_rpc_log_get_flags(struct spdk_jsonrpc_request *request,
} }
SPDK_RPC_REGISTER("log_get_flags", spdk_rpc_log_get_flags, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("log_get_flags", spdk_rpc_log_get_flags, SPDK_RPC_STARTUP | SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_get_flags, get_log_flags) SPDK_RPC_REGISTER_ALIAS_DEPRECATED(log_get_flags, get_log_flags)
SPDK_LOG_REGISTER_COMPONENT("log_rpc", SPDK_LOG_LOG_RPC)

2
test/make/check_so_deps.sh
View File

@ -56,6 +56,8 @@ function confirm_abi_deps() {
name = spdk_jsonrpc_free_request name = spdk_jsonrpc_free_request
[suppress_function] [suppress_function]
name = spdk_jsonrpc_parse_response name = spdk_jsonrpc_parse_response
[suppress_variable]
name = SPDK_LOG_LOG_RPC
EOF EOF
for object in "$libdir"/libspdk_*.so; do for object in "$libdir"/libspdk_*.so; do