From 62e1096fb01f7a12c5bc5ff77e3cb427248b80ad Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Thu, 7 Apr 2011 07:44:51 +0000 Subject: removed reference to GF_LOG_NORMAL instead used GF_LOG_INFO, which is more standard log level. Signed-off-by: Amar Tumballi Signed-off-by: Vijay Bellur BUG: 2669 (RuntimeError: cannot recognize log level "normal") URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2669 --- xlators/mount/fuse/src/fuse-bridge.c | 4 ++-- xlators/mount/fuse/utils/mount.glusterfs.in | 14 +++++++------- xlators/mount/fuse/utils/mount_glusterfs.in | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'xlators/mount/fuse') diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index eb0ef9efde7..6fa484acbc2 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -3214,7 +3214,7 @@ fuse_thread_proc (void *data) mount_point = data_to_str (dict_get (this->options, ZR_MOUNTPOINT_OPT)); if (mount_point) { - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "unmounting %s", mount_point); dict_del (this->options, ZR_MOUNTPOINT_OPT); } @@ -3684,7 +3684,7 @@ fini (xlator_t *this_xl) mount_point = data_to_str (dict_get (this_xl->options, ZR_MOUNTPOINT_OPT)); if (mount_point != NULL) { - gf_log (this_xl->name, GF_LOG_NORMAL, + gf_log (this_xl->name, GF_LOG_INFO, "Unmounting '%s'.", mount_point); dict_del (this_xl->options, ZR_MOUNTPOINT_OPT); diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in index d14c30c8096..c805a7cd5a6 100755 --- a/xlators/mount/fuse/utils/mount.glusterfs.in +++ b/xlators/mount/fuse/utils/mount.glusterfs.in @@ -23,12 +23,12 @@ _init () LOG_CRITICAL=CRITICAL; LOG_ERROR=ERROR; LOG_WARNING=WARNING; - LOG_NORMAL=NORMAL + LOG_INFO=INFO LOG_DEBUG=DEBUG; LOG_TRACE=TRACE; - # set default log level to NORMAL - log_level=$LOG_NORMAL; + # set default log level to INFO + log_level=$LOG_INFO; prefix="@prefix@"; exec_prefix=@exec_prefix@; cmd_line=$(echo "@sbindir@/glusterfs"); @@ -43,8 +43,8 @@ start_glusterfs () "ERROR") log_level=$LOG_ERROR; ;; - "NORMAL") - log_level=$LOG_NORMAL + "INFO") + log_level=$LOG_INFO ;; "DEBUG") log_level=$LOG_DEBUG; @@ -62,8 +62,8 @@ start_glusterfs () log_level=$LOG_NONE; ;; *) - echo "invalid log level $log_level_str, using NORMAL"; - log_level=$LOG_NORMAL; + echo "invalid log level $log_level_str, using INFO"; + log_level=$LOG_INFO; ;; esac fi diff --git a/xlators/mount/fuse/utils/mount_glusterfs.in b/xlators/mount/fuse/utils/mount_glusterfs.in index 473ecace95e..d36fdeeda24 100755 --- a/xlators/mount/fuse/utils/mount_glusterfs.in +++ b/xlators/mount/fuse/utils/mount_glusterfs.in @@ -25,11 +25,11 @@ _init () LOG_CRITICAL=CRITICAL; LOG_ERROR=ERROR; LOG_WARNING=WARNING; - LOG_NORMAL=NORMAL; + LOG_INFO=INFO; LOG_DEBUG=DEBUG; # set default log level to ERROR - log_level=$LOG_NORMAL; + log_level=$LOG_INFO; } start_glusterfs () @@ -43,8 +43,8 @@ start_glusterfs () "ERROR") log_level=$LOG_ERROR; ;; - "NORMAL") - log_level=$LOG_NORMAL; + "INFO") + log_level=$LOG_INFO; ;; "DEBUG") log_level=$LOG_DEBUG; @@ -59,8 +59,8 @@ start_glusterfs () log_level=$LOG_NONE; ;; *) - echo "invalid log level $log_level_str, using NORMAL"; - log_level=$LOG_NORMAL; + echo "invalid log level $log_level_str, using INFO"; + log_level=$LOG_INFO; ;; esac fi -- cgit