Commit ed0e32a1 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

lib/logrpc: create a new log flag. 



The log_rpc library should have its own flag.

Signed-off-by: default avatarSeth 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 134590a2

lib/log_rpc/log_rpc.c

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

				    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_json_decode_object failed");

		goto invalid;
@@ -116,7 +116,7 @@ spdk_rpc_log_set_print_level(struct spdk_jsonrpc_request *request, 


	level = _parse_log_level(req.level);

	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,

						 "invalid log level");

		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,

				    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_json_decode_object failed");

		goto invalid;
@@ -186,7 +186,7 @@ spdk_rpc_log_set_level(struct spdk_jsonrpc_request *request, 


	level = _parse_log_level(req.level);

	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,

						 "invalid log level");

		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,

				    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_json_decode_object failed");

		goto invalid;

	}



	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,

						 "invalid flag 0");

		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,

				    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_json_decode_object failed");

		goto invalid;

	}



	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,

						 "invalid flag 0");

		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_ALIAS_DEPRECATED(log_get_flags, get_log_flags)



SPDK_LOG_REGISTER_COMPONENT("log_rpc", SPDK_LOG_LOG_RPC)

test/make/check_so_deps.sh

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ function confirm_abi_deps() { 
	name = spdk_jsonrpc_free_request

[suppress_function]

	name = spdk_jsonrpc_parse_response

[suppress_variable]

	name = SPDK_LOG_LOG_RPC

EOF



	for object in "$libdir"/libspdk_*.so; do