Skip to content

Commit

Permalink
mxqsub: Add --verbose option
Browse files Browse the repository at this point in the history
  • Loading branch information
mariux committed May 21, 2015
1 parent 97b381b commit ed03295
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions mxqsub.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,10 @@ static void print_usage(void)
"\n"
"Other options:\n"
"\n"
" --debug set debug log level (default: warning log level)\n"
" --version print version and exit\n"
" --help print this help and exit ;)\n"
" -v | --verbose be more verbose\n"
" --debug set debug log level (default: warning log level)\n"
" --version print version and exit\n"
" --help print this help and exit ;)\n"
"\n"
"Change how to connect to the mysql server:\n"
"\n"
Expand Down Expand Up @@ -395,6 +396,7 @@ int main(int argc, char *argv[])
mode_t arg_umask;
char *arg_mysql_default_file;
char *arg_mysql_default_group;
char arg_debug;

_mx_cleanup_free_ char *current_workdir = NULL;
_mx_cleanup_free_ char *arg_stdout_absolute = NULL;
Expand Down Expand Up @@ -424,6 +426,7 @@ int main(int argc, char *argv[])
MX_OPTION_REQUIRED_ARG("time", 4),

MX_OPTION_NO_ARG("debug", 5),
MX_OPTION_NO_ARG("verbose", 'v'),

MX_OPTION_REQUIRED_ARG("group-name", 'N'),
MX_OPTION_REQUIRED_ARG("group-priority", 'P'),
Expand Down Expand Up @@ -465,6 +468,7 @@ int main(int argc, char *argv[])
arg_stdout = "/dev/null";
arg_stderr = "stdout";
arg_umask = getumask();
arg_debug = 0;

arg_mysql_default_group = getenv("MXQ_MYSQL_DEFAULT_GROUP");
if (!arg_mysql_default_group)
Expand Down Expand Up @@ -494,9 +498,15 @@ int main(int argc, char *argv[])
exit(EX_USAGE);

case 5:
arg_debug = 1;
mx_log_level_set(MX_LOG_DEBUG);
break;

case 'v':
if (!arg_debug)
mx_log_level_set(MX_LOG_INFO);
break;

case 'p':
if (mx_strtou16(optctl.optarg, &arg_priority) < 0) {
mx_log_crit("--priority '%s': %m", optctl.optarg);
Expand Down Expand Up @@ -711,7 +721,7 @@ int main(int argc, char *argv[])
mx_mysql_finish(&mysql);

if (res < 0) {
mx_log_err("mxq_submit_task() failed: %m");
mx_log_err("Job submission failed: %m");
return 1;
}

Expand Down

0 comments on commit ed03295

Please sign in to comment.