diff options
| author | shishir gowda <shishirng@gluster.com> | 2010-10-18 08:15:30 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-10-24 22:43:00 -0700 |
| commit | cfad660310978ffda6263d44ab2445d42c2621b2 (patch) | |
| tree | df77387dcf6d67e8c9c7113e396ef2c450e7218f /xlators | |
| parent | f014877f37488d6f9d4c505f0675ad45cd770546 (diff) | |
Log level mess clean up
Signed-off-by: shishir gowda <shishirng@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 1886 (log-level mess)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1886
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/debug/io-stats/src/io-stats.c | 17 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 30 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.h | 1 |
3 files changed, 17 insertions, 31 deletions
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c index 17d4e2909fa..8068ff4160e 100644 --- a/xlators/debug/io-stats/src/io-stats.c +++ b/xlators/debug/io-stats/src/io-stats.c @@ -1702,6 +1702,23 @@ fini (xlator_t *this) return; } +int +validate_options (xlator_t *this, dict_t *options, char **op_errstr) +{ + int ret = -1; + char *log_str = NULL; + + ret = dict_get_str (options, "log-level", &log_str); + if (ret) + return 0; + ret = glusterd_check_log_level(log_str); + if (ret == -1) + *op_errstr = gf_strdup ("Invalid log level. possible option are" + " DEBUG|WARNING|ERROR|CRITICAL|NONE|TRACE"); + else + ret = 0; + return ret; +} struct xlator_fops fops = { .stat = io_stats_stat, diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index f3b237fb529..c8846a4faa0 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -738,8 +738,6 @@ loglevel_option_handler (glusterfs_graph_t *graph, !strstr (vme->key, role)) return 0; - if (glusterd_check_log_level(vme->value) == -1) - return -1; memcpy (&vme2, vme, sizeof (vme2)); vme2.option = "log-level"; @@ -1386,31 +1384,3 @@ out: gf_log ("", GF_LOG_DEBUG, "Returning %d", ret); return ret; } - -int -glusterd_check_log_level (const char *value) -{ - int log_level = -1; - - if (!strcasecmp (value, "CRITICAL")) { - log_level = GF_LOG_CRITICAL; - } else if (!strcasecmp (value, "ERROR")) { - log_level = GF_LOG_ERROR; - } else if (!strcasecmp (value, "WARNING")) { - log_level = GF_LOG_WARNING; - } else if (!strcasecmp (value, "INFO")) { - log_level = GF_LOG_INFO; - } else if (!strcasecmp (value, "DEBUG")) { - log_level = GF_LOG_DEBUG; - } else if (!strcasecmp (value, "TRACE")) { - log_level = GF_LOG_TRACE; - } else if (!strcasecmp (value, "NONE")) { - log_level = GF_LOG_NONE; - } - - if (log_level == -1) - gf_log ("", GF_LOG_ERROR, "Invalid log-level. possible values " - "are DEBUG|WARNING|ERROR|CRITICAL|NONE|TRACE"); - - return log_level; -} diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.h b/xlators/mgmt/glusterd/src/glusterd-volgen.h index 0e6be800d81..e84e183ee53 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.h +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.h @@ -41,5 +41,4 @@ int glusterd_delete_volfile (glusterd_volinfo_t *volinfo, int glusterd_volinfo_get (glusterd_volinfo_t *volinfo, char *key, char **value); -int glusterd_check_log_level (const char *log_level); #endif |