diff options
| -rw-r--r-- | api/src/glfs.c | 2 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 6 | ||||
| -rw-r--r-- | libglusterfs/src/common-utils.c | 12 | ||||
| -rw-r--r-- | libglusterfs/src/common-utils.h | 8 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.h | 1 |
5 files changed, 20 insertions, 9 deletions
diff --git a/api/src/glfs.c b/api/src/glfs.c index c7bf6cd483e..a7b4962fb1d 100644 --- a/api/src/glfs.c +++ b/api/src/glfs.c @@ -869,7 +869,7 @@ pub_glfs_set_logging (struct glfs *fs, const char *logfile, int loglevel) THIS->ctx = fs->ctx; if (!logfile) { - ret = gf_set_log_file_path (&fs->ctx->cmd_args); + ret = gf_set_log_file_path (&fs->ctx->cmd_args, fs->ctx); if (ret) goto out; tmplog = fs->ctx->cmd_args.log_file; diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 540451c059e..7c07e3d0bfb 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -75,10 +75,6 @@ #include "daemon.h" #include "tw.h" -/* process mode definitions */ -#define GF_SERVER_PROCESS 0 -#define GF_CLIENT_PROCESS 1 -#define GF_GLUSTERD_PROCESS 2 /* using argp for command line parsing */ static char gf_doc[] = ""; @@ -1561,7 +1557,7 @@ logging_init (glusterfs_ctx_t *ctx, const char *progpath) cmd_args = &ctx->cmd_args; if (cmd_args->log_file == NULL) { - ret = gf_set_log_file_path (cmd_args); + ret = gf_set_log_file_path (cmd_args, ctx); if (ret == -1) { fprintf (stderr, "ERROR: failed to set the log file " "path\n"); 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))) diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index 3c7f27bb03a..909471401bb 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -38,7 +38,6 @@ #include "glusterd-rcu.h" #define GLUSTERD_TR_LOG_SIZE 50 -#define GLUSTERD_NAME "glusterd" #define GLUSTERD_SOCKET_LISTEN_BACKLOG 128 #define GLUSTERD_QUORUM_TYPE_KEY "cluster.server-quorum-type" #define GLUSTERD_QUORUM_RATIO_KEY "cluster.server-quorum-ratio" |