diff options
| author | Vijay Bellur <vbellur@redhat.com> | 2016-08-08 13:11:29 -0400 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-08-23 11:57:34 -0700 |
| commit | 5ce748ca45c6f2f867819400f50c9cdc12604226 (patch) | |
| tree | ffb1ea26bf02cd13881549046f87dbc77eb3dedb | |
| parent | 063a234e6265265606425449da1d6c2f97fbf457 (diff) | |
logging: Avoid re-initing log level in io-stats
If log level is already set via api or command line, initialization of
io-stats xlator overwrites the log level to GF_LOG_INFO. This patch
prevents re-initialization of log level if already set.
Change-Id: I1f74d94ef8068b95ec696638c0a8b17d8d71aabe
BUG: 1368882
Signed-off-by: Vijay Bellur <vbellur@redhat.com>
Reported-by: Colin Lord <clord@redhat.com>
Reviewed-on: http://review.gluster.org/15112
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
| -rw-r--r-- | libglusterfs/src/ctx.c | 2 | ||||
| -rw-r--r-- | xlators/debug/io-stats/src/io-stats.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libglusterfs/src/ctx.c b/libglusterfs/src/ctx.c index 2aa14654b9e..b009e6270a2 100644 --- a/libglusterfs/src/ctx.c +++ b/libglusterfs/src/ctx.c @@ -35,6 +35,8 @@ glusterfs_ctx_new () ctx->daemon_pipe[0] = -1; ctx->daemon_pipe[1] = -1; + ctx->log.loglevel = DEFAULT_LOG_LEVEL; + /* lock is never destroyed! */ ret = LOCK_INIT (&ctx->lock); if (ret) { diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c index e2963b7c196..86c0c189d89 100644 --- a/xlators/debug/io-stats/src/io-stats.c +++ b/xlators/debug/io-stats/src/io-stats.c @@ -3720,7 +3720,8 @@ init (xlator_t *this) GF_OPTION_INIT ("log-level", log_str, str, out); if (log_str) { log_level = glusterd_check_log_level (log_str); - gf_log_set_loglevel (log_level); + if (DEFAULT_LOG_LEVEL != log_level) + gf_log_set_loglevel (log_level); } GF_OPTION_INIT ("logger", logger_str, str, out); |