Skip to content

L
lxc
Unverified Commit 1e764f80 by 2xsec Committed by Christian Brauner
Options

tools: lxc-stop: add default log priority & cleanups

Signed-off-by: 's avatar2xsec <dh48.jeong@samsung.com>
parent 765604fa
Showing with 46 additions and 45 deletions
src/lxc/tools/lxc_stop.c
...@@ -34,36 +34,12 @@ ...@@ -34,36 +34,12 @@
#include "log.h" #include "log.h"
#include "utils.h" #include "utils.h"
#define OPT_NO_LOCK OPT_USAGE + 1 #define OPT_NO_LOCK (OPT_USAGE + 1)
#define OPT_NO_KILL OPT_USAGE + 2 #define OPT_NO_KILL (OPT_USAGE + 2)
lxc_log_define(lxc_stop, lxc); lxc_log_define(lxc_stop, lxc);
static int my_parser(struct lxc_arguments *args, int c, char *arg) static int my_parser(struct lxc_arguments *args, int c, char *arg);
{
switch (c) {
case 'r':
args->reboot = 1;
break;
case 'W':
args->nowait = 1;
break;
case 't':
if (lxc_safe_long(arg, &args->timeout) < 0)
return -1;
break;
case 'k':
args->hardstop = 1;
break;
case OPT_NO_LOCK:
args->nolock = 1;
break;
case OPT_NO_KILL:
args->nokill = 1;
break;
}
return 0;
}
static const struct option my_longopts[] = { static const struct option my_longopts[] = {
{"reboot", no_argument, 0, 'r'}, {"reboot", no_argument, 0, 'r'},
...@@ -76,8 +52,8 @@ static const struct option my_longopts[] = { ...@@ -76,8 +52,8 @@ static const struct option my_longopts[] = {
}; };
static struct lxc_arguments my_args = { static struct lxc_arguments my_args = {
.progname = "lxc-stop", .progname = "lxc-stop",
.help = "\ .help = "\
--name=NAME\n\ --name=NAME\n\
\n\ \n\
lxc-stop stops a container with the identifier NAME\n\ lxc-stop stops a container with the identifier NAME\n\
...@@ -91,12 +67,40 @@ Options :\n\ ...@@ -91,12 +67,40 @@ Options :\n\
--nolock Avoid using API locks\n\ --nolock Avoid using API locks\n\
--nokill Only request clean shutdown, don't force kill after timeout\n\ --nokill Only request clean shutdown, don't force kill after timeout\n\
--rcfile=FILE Load configuration file FILE\n", --rcfile=FILE Load configuration file FILE\n",
.options = my_longopts, .options = my_longopts,
.parser = my_parser, .parser = my_parser,
.checker = NULL, .checker = NULL,
.timeout = -2, .log_priority = "ERROR",
.log_file = "none",
.timeout = -2,
}; };
static int my_parser(struct lxc_arguments *args, int c, char *arg)
{
switch (c) {
case 'r':
args->reboot = 1;
break;
case 'W':
args->nowait = 1;
break;
case 't':
if (lxc_safe_long(arg, &args->timeout) < 0)
return -1;
break;
case 'k':
args->hardstop = 1;
break;
case OPT_NO_LOCK:
args->nolock = 1;
break;
case OPT_NO_KILL:
args->nokill = 1;
break;
}
return 0;
}
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
struct lxc_container *c; struct lxc_container *c;
...@@ -107,18 +111,15 @@ int main(int argc, char *argv[]) ...@@ -107,18 +111,15 @@ int main(int argc, char *argv[])
if (lxc_arguments_parse(&my_args, argc, argv)) if (lxc_arguments_parse(&my_args, argc, argv))
exit(ret); exit(ret);
/* Only create log if explicitly instructed */ log.name = my_args.name;
if (my_args.log_file || my_args.log_priority) { log.file = my_args.log_file;
log.name = my_args.name; log.level = my_args.log_priority;
log.file = my_args.log_file; log.prefix = my_args.progname;
log.level = my_args.log_priority; log.quiet = my_args.quiet;
log.prefix = my_args.progname; log.lxcpath = my_args.lxcpath[0];
log.quiet = my_args.quiet;
log.lxcpath = my_args.lxcpath[0]; if (lxc_log_init(&log))
exit(ret);
if (lxc_log_init(&log))
exit(ret);
}
/* Set default timeout */ /* Set default timeout */
if (my_args.timeout == -2) { if (my_args.timeout == -2) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment