diff options
| author | Amar Tumballi <amar@gluster.com> | 2011-04-07 07:44:51 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2011-04-07 11:40:25 -0700 |
| commit | 62e1096fb01f7a12c5bc5ff77e3cb427248b80ad (patch) | |
| tree | 863f24a67574834751693a82fee9df158bdeb253 /glusterfsd | |
| parent | 19b2e01f1c53c358c5673c3d216c0349b55481a6 (diff) | |
removed reference to GF_LOG_NORMAL
instead used GF_LOG_INFO, which is more standard log level.
Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Vijay Bellur <vijay@gluster.com>
BUG: 2669 (RuntimeError: cannot recognize log level "normal")
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2669
Diffstat (limited to 'glusterfsd')
| -rw-r--r-- | glusterfsd/src/glusterfsd-mgmt.c | 2 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 8 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index 77b18e972..1e10056ac 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -634,7 +634,7 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count, size = rsp.op_ret; if (size == oldvollen && (memcmp (oldvolfile, rsp.spec, size) == 0)) { - gf_log ("", GF_LOG_NORMAL, "No change in volfile, continuing"); + gf_log ("", GF_LOG_INFO, "No change in volfile, continuing"); goto out; } diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index d784e0d87..9406d74ac 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -113,8 +113,8 @@ static struct argp_option gf_options[] = { "File to use as VOLUME FILE"}, {"log-level", ARGP_LOG_LEVEL_KEY, "LOGLEVEL", 0, - "Logging severity. Valid options are DEBUG, NORMAL, WARNING, ERROR, " - "CRITICAL and NONE [default: NORMAL]"}, + "Logging severity. Valid options are DEBUG, INFO, WARNING, ERROR, " + "CRITICAL and NONE [default: INFO]"}, {"log-file", ARGP_LOG_FILE_KEY, "LOGFILE", 0, "File to use for logging [default: " DEFAULT_LOG_FILE_DIRECTORY "/" PACKAGE_NAME ".log" "]"}, @@ -529,8 +529,8 @@ parse_opts (int key, char *arg, struct argp_state *state) cmd_args->log_level = GF_LOG_WARNING; break; } - if (strcasecmp (arg, ARGP_LOG_LEVEL_NORMAL_OPTION) == 0) { - cmd_args->log_level = GF_LOG_NORMAL; + if (strcasecmp (arg, ARGP_LOG_LEVEL_INFO_OPTION) == 0) { + cmd_args->log_level = GF_LOG_INFO; break; } if (strcasecmp (arg, ARGP_LOG_LEVEL_DEBUG_OPTION) == 0) { diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h index ffe8b596e..6fb1ebbe3 100644 --- a/glusterfsd/src/glusterfsd.h +++ b/glusterfsd/src/glusterfsd.h @@ -30,7 +30,7 @@ #define DEFAULT_CLIENT_VOLFILE CONFDIR "/glusterfs.vol" #define DEFAULT_SERVER_VOLFILE CONFDIR "/glusterfsd.vol" #define DEFAULT_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs" -#define DEFAULT_LOG_LEVEL GF_LOG_NORMAL +#define DEFAULT_LOG_LEVEL GF_LOG_INFO #define DEFAULT_EVENT_POOL_SIZE 16384 @@ -39,7 +39,7 @@ #define ARGP_LOG_LEVEL_CRITICAL_OPTION "CRITICAL" #define ARGP_LOG_LEVEL_ERROR_OPTION "ERROR" #define ARGP_LOG_LEVEL_WARNING_OPTION "WARNING" -#define ARGP_LOG_LEVEL_NORMAL_OPTION "NORMAL" +#define ARGP_LOG_LEVEL_INFO_OPTION "INFO" #define ARGP_LOG_LEVEL_DEBUG_OPTION "DEBUG" #define ENABLE_NO_DAEMON_MODE 1 |