proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 09:01:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
This commit is contained in:
2xsec 2018-08-18 01:38:13 +09:00
parent a53759568a
commit 9fe1638742
1 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/lxc/tools/lxc_device.c
View File

@ -33,21 +33,23 @@
#include "log.h" #include "log.h"
#include "utils.h" #include "utils.h"
lxc_log_define(lxc_device, lxc);
#if HAVE_IFADDRS_H #if HAVE_IFADDRS_H
#include <ifaddrs.h> #include <ifaddrs.h>
#else #else
#include "include/ifaddrs.h" #include "include/ifaddrs.h"
#endif #endif
lxc_log_define(lxc_device, lxc);
static bool is_interface(const char *dev_name, pid_t pid);
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-device", .progname = "lxc-device",
.help = "\ .help = "\
--name=NAME -- add|del DEV\n\ --name=NAME -- add|del DEV\n\
\n\ \n\
lxc-device attach or detach DEV to or from container.\n\ lxc-device attach or detach DEV to or from container.\n\
@ -55,9 +57,11 @@ lxc-device attach or detach DEV to or from container.\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 = NULL, .checker = NULL,
.log_priority = "ERROR",
.log_file = "none",
}; };
static bool is_interface(const char *dev_name, pid_t pid) static bool is_interface(const char *dev_name, pid_t pid)
@ -110,25 +114,22 @@ int main(int argc, char *argv[])
} }
if (lxc_arguments_parse(&my_args, argc, argv)) if (lxc_arguments_parse(&my_args, argc, argv))
goto err; 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);
}
c = lxc_container_new(my_args.name, my_args.lxcpath[0]); c = lxc_container_new(my_args.name, my_args.lxcpath[0]);
if (!c) { if (!c) {
ERROR("%s doesn't exist", my_args.name); ERROR("%s doesn't exist", my_args.name);
goto err; exit(EXIT_FAILURE);
} }
if (my_args.rcfile) { if (my_args.rcfile) {
@ -136,65 +137,60 @@ int main(int argc, char *argv[])
if (!c->load_config(c, my_args.rcfile)) { if (!c->load_config(c, my_args.rcfile)) {
ERROR("Failed to load rcfile"); ERROR("Failed to load rcfile");
goto err1; goto err;
} }
c->configfile = strdup(my_args.rcfile); c->configfile = strdup(my_args.rcfile);
if (!c->configfile) { if (!c->configfile) {
ERROR("Out of memory setting new config filename"); ERROR("Out of memory setting new config filename");
goto err1; goto err;
} }
} }
if (!c->is_running(c)) { if (!c->is_running(c)) {
ERROR("Container %s is not running", c->name); ERROR("Container %s is not running", c->name);
goto err1; goto err;
} }
if (my_args.argc < 2) { if (my_args.argc < 2) {
ERROR("Error: no command given (Please see --help output)"); ERROR("Error: no command given (Please see --help output)");
goto err1; goto err;
} }
cmd = my_args.argv[0]; cmd = my_args.argv[0];
dev_name = my_args.argv[1]; dev_name = my_args.argv[1];
if (my_args.argc < 3) if (my_args.argc < 3)
dst_name = dev_name; dst_name = dev_name;
else else
dst_name = my_args.argv[2]; dst_name = my_args.argv[2];
if (strncmp(cmd, "add", strlen(cmd)) == 0) { if (strncmp(cmd, "add", strlen(cmd)) == 0) {
if (is_interface(dev_name, 1)) { if (is_interface(dev_name, 1))
ret = c->attach_interface(c, dev_name, dst_name); ret = c->attach_interface(c, dev_name, dst_name);
} else { else
ret = c->add_device_node(c, dev_name, dst_name); ret = c->add_device_node(c, dev_name, dst_name);
}
if (ret != true) { if (ret != true) {
ERROR("Failed to add %s to %s", dev_name, c->name); ERROR("Failed to add %s to %s", dev_name, c->name);
goto err1; goto err;
} }
} else if (strncmp(cmd, "del", strlen(cmd)) == 0) { } else if (strncmp(cmd, "del", strlen(cmd)) == 0) {
if (is_interface(dev_name, c->init_pid(c))) { if (is_interface(dev_name, c->init_pid(c)))
ret = c->detach_interface(c, dev_name, dst_name); ret = c->detach_interface(c, dev_name, dst_name);
} else { else
ret = c->remove_device_node(c, dev_name, dst_name); ret = c->remove_device_node(c, dev_name, dst_name);
}
if (ret != true) { if (ret != true) {
ERROR("Failed to del %s from %s", dev_name, c->name); ERROR("Failed to del %s from %s", dev_name, c->name);
goto err1; goto err;
} }
} else { } else {
ERROR("Error: Please use add or del (Please see --help output)"); ERROR("Error: Please use add or del (Please see --help output)");
goto err1; goto err;
} }
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
err1:
lxc_container_put(c);
err: err:
lxc_container_put(c);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }