summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrutika Dhananjay <kdhananj@redhat.com>2014-03-30 08:37:02 +0530
committerVijay Bellur <vbellur@redhat.com>2014-04-05 11:15:31 -0700
commitd586ecc0a501440436a918ed973fd75facafc455 (patch)
tree0f76d87fd656dfd272150457ae9435bff6cd4b38
parent091c49d85cf727ab9c391ba1ac2b44e1091fd259 (diff)
log: Add missing log message from glusterfsd.c to glusterfsd-messages.h
... by retaining GLFS_NUM_MESSAGES as 33 which is its correct value. Also replace all occurrences of gf_log with gf_msg/gf_msg_debug. Change-Id: Ibfbe1d645de521e8d59ca406f78b1a8eb08aa7e0 BUG: 1075611 Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com> Reviewed-on: http://review.gluster.org/7371 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--glusterfsd/src/glusterfsd-messages.h3
-rw-r--r--glusterfsd/src/glusterfsd.c12
2 files changed, 7 insertions, 8 deletions
diff --git a/glusterfsd/src/glusterfsd-messages.h b/glusterfsd/src/glusterfsd-messages.h
index 48a0b17..3165c97 100644
--- a/glusterfsd/src/glusterfsd-messages.h
+++ b/glusterfsd/src/glusterfsd-messages.h
@@ -104,6 +104,9 @@
" sync-environment"
#define glusterfsd_msg_32 (GLFS_COMP_BASE + 32), "received signum (%d)," \
" shutting down"
+#define glusterfsd_msg_33 (GLFS_COMP_BASE + 33), "obsolete option " \
+ "'--volfile-max-fetch-attempts or fetch-attempts' " \
+ "was provided"
/*------------*/
#define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages"
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index 449fadd..9c9fad9 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -461,8 +461,7 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)
ret = dict_set_static_ptr (options, "no-root-squash",
"enable");
if (ret < 0) {
- gf_log ("glusterfsd", GF_LOG_ERROR,
- "failed to set 'enable' for key "
+ gf_msg ("glusterfsd", GF_LOG_ERROR, 0, glusterfsd_msg_6,
"no-root-squash");
goto err;
}
@@ -472,12 +471,11 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)
ret = dict_set_static_ptr (options, "no-root-squash",
"disable");
if (ret < 0) {
- gf_log ("glusterfsd", GF_LOG_ERROR,
- "failed to set 'disable' for key "
+ gf_msg ("glusterfsd", GF_LOG_ERROR, 0, glusterfsd_msg_5,
"no-root-squash");
goto err;
}
- gf_log ("", GF_LOG_DEBUG, "fuse no-root-squash mode %d",
+ gf_msg_debug ("glusterfsd", 0, "fuse no-root-squash mode %d",
cmd_args->no_root_squash);
break;
}
@@ -1481,9 +1479,7 @@ parse_cmdline (int argc, char *argv[], glusterfs_ctx_t *ctx)
compatibility with third party applications
*/
if (cmd_args->max_connect_attempts) {
- gf_log ("glusterfs", GF_LOG_WARNING,
- "obsolete option '--volfile-max-fetch-attempts"
- " or fetch-attempts' was provided");
+ gf_msg ("glusterfs", GF_LOG_WARNING, 0, glusterfsd_msg_33);
}
#ifdef GF_DARWIN_HOST_OS