diff options
Diffstat (limited to 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/common-utils.c | 12 | ||||
| -rw-r--r-- | libglusterfs/src/common-utils.h | 8 |
2 files changed, 18 insertions, 2 deletions
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c index 97d9ef8da1a..7b19208343f 100644 --- a/libglusterfs/src/common-utils.c +++ b/libglusterfs/src/common-utils.c @@ -3409,7 +3409,7 @@ out: /* Sets log file path from user provided arguments */ int -gf_set_log_file_path (cmd_args_t *cmd_args) +gf_set_log_file_path (cmd_args_t *cmd_args, glusterfs_ctx_t *ctx) { int i = 0; int j = 0; @@ -3438,6 +3438,16 @@ gf_set_log_file_path (cmd_args_t *cmd_args) goto done; } + if (ctx && GF_GLUSTERD_PROCESS == ctx->process_mode) { + ret = gf_asprintf (&cmd_args->log_file, + DEFAULT_LOG_FILE_DIRECTORY "/%s.log", + GLUSTERD_NAME); + if (ret > 0) + ret = 0; + + goto done; + } + if (cmd_args->volfile) { j = 0; i = 0; diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h index 4741d430a03..a83678fe322 100644 --- a/libglusterfs/src/common-utils.h +++ b/libglusterfs/src/common-utils.h @@ -68,6 +68,7 @@ void trap (void); #define GEOREP "geo-replication" #define GHADOOP "glusterfs-hadoop" +#define GLUSTERD_NAME "glusterd" #define GF_SELINUX_XATTR_KEY "security.selinux" @@ -78,6 +79,11 @@ void trap (void); !strcmp (fs_name, "ext3") || \ !strcmp (fs_name, "ext4")) +/* process mode definitions */ +#define GF_SERVER_PROCESS 0 +#define GF_CLIENT_PROCESS 1 +#define GF_GLUSTERD_PROCESS 2 + /* Defining this here as it is needed by glusterd for setting * nfs port in volume status. */ @@ -216,7 +222,7 @@ int32_t gf_resolve_ip6 (const char *hostname, uint16_t port, int family, void gf_log_dump_graph (FILE *specfp, glusterfs_graph_t *graph); void gf_print_trace (int32_t signal, glusterfs_ctx_t *ctx); -int gf_set_log_file_path (cmd_args_t *cmd_args); +int gf_set_log_file_path (cmd_args_t *cmd_args, glusterfs_ctx_t *ctx); int gf_set_log_ident (cmd_args_t *cmd_args); #define VECTORSIZE(count) (count * (sizeof (struct iovec))) |