andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cli: add log file for cli instead of '/dev/null'

Browse Source 
Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>

BUG: 2737 (there is no log file for gluster cli)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2737
This commit is contained in:
Amar Tumballi 2011-04-13 00:29:16 +00:00 committed by Anand Avati
parent 4d6e05f0aa
commit 9b0374043e
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cli/src/cli.c
View File

@ -225,10 +225,6 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
cmd_args = &ctx->cmd_args;
/* parsing command line arguments */
cmd_args->log_file = "/dev/null";
cmd_args->log_level = GF_LOG_NONE;
INIT_LIST_HEAD (&cmd_args->xlator_options);
lim.rlim_cur = RLIM_INFINITY;
@ -242,10 +238,18 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
static int
logging_init (glusterfs_ctx_t *ctx)
{
int ret = 0;
cmd_args_t *cmd_args = NULL;
cmd_args = &ctx->cmd_args;
/* CLI should not have something to DEBUG after the release,
hence defaulting to INFO loglevel */
cmd_args->log_level = GF_LOG_INFO;
ret = gf_asprintf (&cmd_args->log_file,
DEFAULT_CLI_LOG_FILE_DIRECTORY "/cli.log");
if (gf_log_init (cmd_args->log_file) == -1) {
fprintf (stderr, "ERROR: failed to open logfile %s\n",
cmd_args->log_file);
@ -615,14 +619,14 @@ main (int argc, char *argv[])
return EPERM;
}
global_rpc = cli_rpc_init (&state);
if (!global_rpc)
goto out;
ret = logging_init (ctx);
if (ret)
goto out;
global_rpc = cli_rpc_init (&state);
if (!global_rpc)
goto out;
ret = cli_cmds_register (&state);
if (ret)
goto out;

1
cli/src/cli.h
View File

@ -33,6 +33,7 @@
#define CLI_GLUSTERD_PORT 24007
#define CLI_DEFAULT_CONN_TIMEOUT 120
#define CLI_DEFAULT_CMD_TIMEOUT 120
#define DEFAULT_CLI_LOG_FILE_DIRECTORY DATADIR "/log/glusterfs"
enum argp_option_keys {
ARGP_DEBUG_KEY = 133,