diff options
| author | Zhang Huan <zhanghuan@open-fs.com> | 2017-12-05 12:45:46 +0800 |
|---|---|---|
| committer | Jeff Darcy <jeff@pl.atyp.us> | 2017-12-06 23:45:23 +0000 |
| commit | 28202631fecbc3b20a55cfc5fa339663db37e955 (patch) | |
| tree | 28124115916e36068848473a9327360844f7cfb4 /xlators | |
| parent | c502ca166473f4f0e027f3475924d8dc4e486bd3 (diff) | |
libglusterfs: specify ctx in gf_log_set_loglevel
specify ctx in gf_log_set_loglevel, instead of getting it from a thread
specific variable.
Change-Id: I498f826e8e32231235a6b0005026a27c327727fd
BUG: 1521213
Signed-off-by: Zhang Huan <zhanghuan@open-fs.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/debug/io-stats/src/io-stats.c | 4 | ||||
| -rw-r--r-- | xlators/debug/trace/src/trace.c | 2 | ||||
| -rw-r--r-- | xlators/features/changelog/lib/src/gf-changelog.c | 2 | ||||
| -rw-r--r-- | xlators/meta/src/loglevel-file.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c index c046aaae181..266f9449c9e 100644 --- a/xlators/debug/io-stats/src/io-stats.c +++ b/xlators/debug/io-stats/src/io-stats.c @@ -3856,7 +3856,7 @@ reconfigure (xlator_t *this, dict_t *options) GF_OPTION_RECONF ("log-level", log_str, options, str, out); if (log_str) { log_level = glusterd_check_log_level (log_str); - gf_log_set_loglevel (log_level); + gf_log_set_loglevel (this->ctx, log_level); } GF_OPTION_RECONF ("logger", logger_str, options, str, out); @@ -4038,7 +4038,7 @@ init (xlator_t *this) if (log_str) { log_level = glusterd_check_log_level (log_str); if (DEFAULT_LOG_LEVEL != log_level) - gf_log_set_loglevel (log_level); + gf_log_set_loglevel (this->ctx, log_level); } GF_OPTION_INIT ("logger", logger_str, str, out); diff --git a/xlators/debug/trace/src/trace.c b/xlators/debug/trace/src/trace.c index 3ad3769afd8..c85f2a7a994 100644 --- a/xlators/debug/trace/src/trace.c +++ b/xlators/debug/trace/src/trace.c @@ -3260,7 +3260,7 @@ init (xlator_t *this) } setloglevel: - gf_log_set_loglevel (conf->trace_log_level); + gf_log_set_loglevel (this->ctx, conf->trace_log_level); this->private = conf; ret = 0; out: diff --git a/xlators/features/changelog/lib/src/gf-changelog.c b/xlators/features/changelog/lib/src/gf-changelog.c index 6ee87b1414e..6ad6c63740d 100644 --- a/xlators/features/changelog/lib/src/gf-changelog.c +++ b/xlators/features/changelog/lib/src/gf-changelog.c @@ -431,7 +431,7 @@ gf_changelog_setup_logging (xlator_t *this, char *logfile, int loglevel) if (gf_log_init (this->ctx, logfile, NULL)) return -1; - gf_log_set_loglevel ((loglevel == -1) ? GF_LOG_INFO : + gf_log_set_loglevel (this->ctx, (loglevel == -1) ? GF_LOG_INFO : loglevel); return 0; } diff --git a/xlators/meta/src/loglevel-file.c b/xlators/meta/src/loglevel-file.c index f9c5a993d73..4399da2c948 100644 --- a/xlators/meta/src/loglevel-file.c +++ b/xlators/meta/src/loglevel-file.c @@ -32,7 +32,7 @@ loglevel_file_write (xlator_t *this, fd_t *fd, struct iovec *iov, int count) level = strtol (iov[0].iov_base, NULL, 0); if (level >= GF_LOG_NONE && level <= GF_LOG_TRACE) - gf_log_set_loglevel (level); + gf_log_set_loglevel (this->ctx, level); return iov_length (iov, count); } |