Skip to content

L
lxc
Unverified Commit eda2d856 by 2xsec Committed by Christian Brauner
Options

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

Signed-off-by: 's avatar2xsec <dh48.jeong@samsung.com>
parent e20cdd87
Showing with 27 additions and 25 deletions
src/lxc/tools/lxc_cgroup.c
...@@ -36,23 +36,15 @@ ...@@ -36,23 +36,15 @@
lxc_log_define(lxc_cgroup, lxc); lxc_log_define(lxc_cgroup, lxc);
static int my_checker(const struct lxc_arguments* args) static int my_checker(const struct lxc_arguments *args);
{
if (!args->argc) {
ERROR("Missing state object");
return -1;
}
return 0;
}
static const struct option my_longopts[] = { static const struct option my_longopts[] = {
LXC_COMMON_OPTIONS LXC_COMMON_OPTIONS
}; };
static struct lxc_arguments my_args = { static struct lxc_arguments my_args = {
.progname = "lxc-cgroup", .progname = "lxc-cgroup",
.help = "\ .help = "\
--name=NAME state-object [value]\n\ --name=NAME state-object [value]\n\
\n\ \n\
Get or set the value of a state object (for example, 'cpuset.cpus')\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\ ...@@ -61,11 +53,23 @@ in the container's cgroup for the corresponding subsystem.\n\
Options :\n\ Options :\n\
-n, --name=NAME NAME of the container\n\ -n, --name=NAME NAME of the container\n\
--rcfile=FILE Load configuration file FILE\n", --rcfile=FILE Load configuration file FILE\n",
.options = my_longopts, .options = my_longopts,
.parser = NULL, .parser = NULL,
.checker = my_checker, .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[]) int main(int argc, char *argv[])
{ {
char *state_object = NULL, *value = NULL; char *state_object = NULL, *value = NULL;
...@@ -75,18 +79,15 @@ int main(int argc, char *argv[]) ...@@ -75,18 +79,15 @@ int main(int argc, char *argv[])
if (lxc_arguments_parse(&my_args, argc, argv)) if (lxc_arguments_parse(&my_args, argc, argv))
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
/* 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)) if (lxc_log_init(&log))
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
}
state_object = my_args.argv[0]; state_object = my_args.argv[0];
...@@ -143,6 +144,7 @@ int main(int argc, char *argv[]) ...@@ -143,6 +144,7 @@ int main(int argc, char *argv[])
lxc_container_put(c); lxc_container_put(c);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
INFO("%*s", ret, buffer); INFO("%*s", ret, buffer);
} }
......
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