From 34a10bfa348a559aa38d7ed6ab8c85d8baef4bda Mon Sep 17 00:00:00 2001 From: 2xsec Date: Sat, 18 Aug 2018 01:42:15 +0900 Subject: [PATCH] tools: lxc-unfreeze: add default log priority & cleanups Signed-off-by: 2xsec --- src/lxc/tools/lxc_unfreeze.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/lxc/tools/lxc_unfreeze.c b/src/lxc/tools/lxc_unfreeze.c index a0b56900f..7a9972c4c 100644 --- a/src/lxc/tools/lxc_unfreeze.c +++ b/src/lxc/tools/lxc_unfreeze.c @@ -40,8 +40,8 @@ static const struct option my_longopts[] = { }; static struct lxc_arguments my_args = { - .progname = "lxc-unfreeze", - .help = "\ + .progname = "lxc-unfreeze", + .help = "\ --name=NAME\n\ \n\ lxc-unfreeze unfreezes a container with the identifier NAME\n\ @@ -49,9 +49,11 @@ lxc-unfreeze unfreezes a container with the identifier NAME\n\ Options :\n\ -n, --name=NAME NAME of the container\n\ --rcfile=FILE Load configuration file FILE\n", - .options = my_longopts, - .parser = NULL, - .checker = NULL, + .options = my_longopts, + .parser = NULL, + .checker = NULL, + .log_priority = "ERROR", + .log_file = "none", }; int main(int argc, char *argv[]) @@ -62,18 +64,15 @@ int main(int argc, char *argv[]) if (lxc_arguments_parse(&my_args, argc, argv)) exit(EXIT_FAILURE); - /* Only create log if explicitly instructed */ - if (my_args.log_file || my_args.log_priority) { - log.name = my_args.name; - log.file = my_args.log_file; - log.level = my_args.log_priority; - log.prefix = my_args.progname; - log.quiet = my_args.quiet; - log.lxcpath = my_args.lxcpath[0]; + log.name = my_args.name; + log.file = my_args.log_file; + log.level = my_args.log_priority; + log.prefix = my_args.progname; + log.quiet = my_args.quiet; + log.lxcpath = my_args.lxcpath[0]; - if (lxc_log_init(&log)) - exit(EXIT_FAILURE); - } + if (lxc_log_init(&log)) + exit(EXIT_FAILURE); c = lxc_container_new(my_args.name, my_args.lxcpath[0]); if (!c) { -- 2.47.2