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

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

diff --git a/src/lxc/tools/lxc_cgroup.c b/src/lxc/tools/lxc_cgroup.c
index 06706c84e82eb036de711ee7e97fbbed73f22d40..069da365fb23716d594cf828d907e93c293edcbc 100644 (file)
--- a/src/lxc/tools/lxc_cgroup.c
+++ b/src/lxc/tools/lxc_cgroup.c
@@ -36,23 +36,15 @@
 
 lxc_log_define(lxc_cgroup, lxc);
 
-static int my_checker(const struct lxc_arguments* args)
-{
-       if (!args->argc) {
-               ERROR("Missing state object");
-               return -1;
-       }
-
-       return 0;
-}
+static int my_checker(const struct lxc_arguments *args);
 
 static const struct option my_longopts[] = {
        LXC_COMMON_OPTIONS
 };
 
 static struct lxc_arguments my_args = {
-       .progname = "lxc-cgroup",
-       .help     = "\
+       .progname     = "lxc-cgroup",
+       .help         = "\
 --name=NAME state-object [value]\n\
 \n\
 Get or set the value of a state object (for example, 'cpuset.cpus')\n\
@@ -61,11 +53,23 @@ in the container's cgroup for the corresponding subsystem.\n\
 Options :\n\
   -n, --name=NAME      NAME of the container\n\
   --rcfile=FILE        Load configuration file FILE\n",
-       .options  = my_longopts,
-       .parser   = NULL,
-       .checker  = my_checker,
+       .options      = my_longopts,
+       .parser       = NULL,
+       .checker      = my_checker,
+       .log_priority = "ERROR",
+       .log_file     = "none",
 };
 
+static int my_checker(const struct lxc_arguments *args)
+{
+       if (!args->argc) {
+               ERROR("Missing state object");
+               return -1;
+       }
+
+       return 0;
+}
+
 int main(int argc, char *argv[])
 {
        char *state_object = NULL, *value = NULL;
@@ -75,18 +79,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);
 
        state_object = my_args.argv[0];
 
@@ -143,6 +144,7 @@ int main(int argc, char *argv[])
                        lxc_container_put(c);
                        exit(EXIT_FAILURE);
                }
+
                INFO("%*s", ret, buffer);
        }