From b8e3b91b8180dcc5e9f8bb62734832ace69ad143 Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Mon, 5 Jan 2015 16:02:40 +0530 Subject: cli: logging improvements 1. cli used to log messages at all log levels. This is related to a peculiar behavior of gcc which treats any enum variable whose type has non-negative only defined values to be an unsigned integer. This would cause cli's loglevel (defaulted from state->loglevel) to be set as (uint)-1 previously and hence all log messages across levels would appear in the cli log file. Now cli's loglevel defaults to log level INFO. 2. Changed logging level of messages of type "Returning %d".. to DEBUG. Change-Id: I05094e523fc277d9ad32cc9d76aee873c0fd3859 BUG: 1168809 Signed-off-by: Vijay Bellur Reviewed-on: http://review.gluster.org/9383 Reviewed-by: Atin Mukherjee Reviewed-by: Raghavendra Bhat Tested-by: Gluster Build System Reviewed-by: Krishnan Parthasarathi Tested-by: Krishnan Parthasarathi --- cli/src/cli-rpc-ops.c | 6 +++--- cli/src/cli-xml-output.c | 2 +- cli/src/cli.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index f86fa63f68d..1d8cf23ff42 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -861,7 +861,7 @@ out: free (rsp.op_errstr); - gf_log ("cli", GF_LOG_INFO, "Returning: %d", ret); + gf_log ("cli", GF_LOG_DEBUG, "Returning: %d", ret); return ret; } @@ -1010,7 +1010,7 @@ out: cli_cmd_broadcast_response (ret); free (rsp.dict.dict_val); - gf_log ("", GF_LOG_INFO, "Returning with %d", ret); + gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret); return ret; } @@ -1148,7 +1148,7 @@ out: if (dict) dict_unref (dict); - gf_log ("", GF_LOG_INFO, "Returning with %d", ret); + gf_log ("", GF_LOG_DEBUG, "Returning with %d", ret); return ret; } diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index aacce140946..dcce53901f4 100644 --- a/cli/src/cli-xml-output.c +++ b/cli/src/cli-xml-output.c @@ -2856,7 +2856,7 @@ cli_xml_output_vol_info_end (cli_local_t *local) ret = cli_end_xml_output (local->writer, local->doc); out: - gf_log ("cli", GF_LOG_ERROR, "Returning %d", ret); + gf_log ("cli", GF_LOG_DEBUG, "Returning %d", ret); return ret; #else return 0; diff --git a/cli/src/cli.c b/cli/src/cli.c index 6d9f5f6c158..b33ce950e11 100644 --- a/cli/src/cli.c +++ b/cli/src/cli.c @@ -455,7 +455,7 @@ cli_state_init (struct cli_state *state) int ret = 0; - state->log_level = -1; + state->log_level = GF_LOG_NONE; tree = &state->tree; tree->state = state; -- cgit