diff options
Diffstat (limited to 'glusterfsd/src')
| -rw-r--r-- | glusterfsd/src/glusterfsd-messages.h | 3 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/glusterfsd/src/glusterfsd-messages.h b/glusterfsd/src/glusterfsd-messages.h index 48a0b17f6fb..3165c971f66 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 449fadda60d..9c9fad96ecd 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 |