proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-26 05:55:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2344 from brauner/2018-05-23/on_demand_log_file

Browse Source 
tools: only create log file when requested
This commit is contained in:
Stéphane Graber 2018-05-23 11:28:01 -04:00 committed by GitHub
commit f217dcd039
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 209 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lxc/tools/lxc_attach.c
View File

@ -270,18 +270,18 @@ int main(int argc, char *argv[])
if (r) if (r)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(EXIT_FAILURE);
log.level = my_args.log_priority; }
log.prefix = my_args.progname;
log.quiet = my_args.quiet;
log.lxcpath = my_args.lxcpath[0];
r = lxc_log_init(&log);
if (r)
exit(EXIT_FAILURE);
if (geteuid()) { if (geteuid()) {
if (access(my_args.lxcpath[0], O_RDONLY) < 0) { if (access(my_args.lxcpath[0], O_RDONLY) < 0) {

19
src/lxc/tools/lxc_autostart.c
View File

@ -347,15 +347,18 @@ 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);
log.name = my_args.name; /* Only create log if explicitly instructed */
log.file = my_args.log_file; if (my_args.log_file || my_args.log_priority) {
log.level = my_args.log_priority; log.name = my_args.name;
log.prefix = my_args.progname; log.file = my_args.log_file;
log.quiet = my_args.quiet; log.level = my_args.log_priority;
log.lxcpath = my_args.lxcpath[0]; log.prefix = my_args.progname;
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);
}
count = list_defined_containers(my_args.lxcpath[0], NULL, &containers); count = list_defined_containers(my_args.lxcpath[0], NULL, &containers);

22
src/lxc/tools/lxc_cgroup.c
View File

@ -73,18 +73,18 @@ 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);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(EXIT_FAILURE);
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);
state_object = my_args.argv[0]; state_object = my_args.argv[0];

22
src/lxc/tools/lxc_checkpoint.c
View File

@ -257,18 +257,18 @@ 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);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(EXIT_FAILURE);
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);
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) {

23
src/lxc/tools/lxc_console.c
View File

@ -97,19 +97,18 @@ int main(int argc, char *argv[])
if (ret) if (ret)
return EXIT_FAILURE; return EXIT_FAILURE;
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(EXIT_FAILURE);
log.level = my_args.log_priority; }
log.prefix = my_args.progname;
log.quiet = my_args.quiet;
log.lxcpath = my_args.lxcpath[0];
ret = lxc_log_init(&log);
if (ret)
return 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) {

22
src/lxc/tools/lxc_copy.c
View File

@ -163,18 +163,18 @@ 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);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(ret);
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(ret);
if (geteuid()) { if (geteuid()) {
if (access(my_args.lxcpath[0], O_RDONLY) < 0) { if (access(my_args.lxcpath[0], O_RDONLY) < 0) {

22
src/lxc/tools/lxc_create.c
View File

@ -227,18 +227,18 @@ 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);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(EXIT_FAILURE);
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 (!my_args.template) { if (!my_args.template) {
fprintf(stderr, "A template must be specified.\n"); fprintf(stderr, "A template must be specified.\n");

22
src/lxc/tools/lxc_destroy.c
View File

@ -70,18 +70,18 @@ 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);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(EXIT_FAILURE);
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 (my_args.quiet) if (my_args.quiet)
quiet = true; quiet = true;

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

@ -110,18 +110,18 @@ int main(int argc, char *argv[])
if (lxc_arguments_parse(&my_args, argc, argv)) if (lxc_arguments_parse(&my_args, argc, argv))
goto err; goto err;
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(EXIT_FAILURE);
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))
goto err;
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) {

19
src/lxc/tools/lxc_execute.c
View File

@ -151,15 +151,18 @@ int main(int argc, char *argv[])
if (lxc_arguments_parse(&my_args, argc, argv)) if (lxc_arguments_parse(&my_args, argc, argv))
exit(err); exit(err);
log.name = my_args.name; /* Only create log if explicitly instructed */
log.file = my_args.log_file; if (my_args.log_file || my_args.log_priority) {
log.level = my_args.log_priority; log.name = my_args.name;
log.prefix = my_args.progname; log.file = my_args.log_file;
log.quiet = my_args.quiet; log.level = my_args.log_priority;
log.lxcpath = my_args.lxcpath[0]; log.prefix = my_args.progname;
log.quiet = my_args.quiet;
log.lxcpath = my_args.lxcpath[0];
if (lxc_log_init(&log)) if (lxc_log_init(&log))
exit(err); exit(err);
}
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) {

22
src/lxc/tools/lxc_freeze.c
View File

@ -60,18 +60,18 @@ 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);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(EXIT_FAILURE);
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);
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) {

22
src/lxc/tools/lxc_info.c
View File

@ -396,18 +396,18 @@ 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);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(ret);
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(ret);
if (print_info(my_args.name, my_args.lxcpath[0]) == 0) if (print_info(my_args.name, my_args.lxcpath[0]) == 0)
ret = EXIT_SUCCESS; ret = EXIT_SUCCESS;

26
src/lxc/tools/lxc_ls.c
View File

@ -211,22 +211,18 @@ 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);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; if (my_args.log_file || my_args.log_priority) {
log.name = NULL;
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))
* We set the first argument that usually takes my_args.name to NULL so exit(EXIT_FAILURE);
* that the log is only used when the user specifies a file. }
*/
log.name = NULL;
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);
struct lengths max_len = { struct lengths max_len = {
/* default header length */ /* default header length */

22
src/lxc/tools/lxc_monitor.c
View File

@ -503,18 +503,18 @@ int main(int argc, char *argv[])
if (lxc_arguments_parse(&my_args, argc, argv)) if (lxc_arguments_parse(&my_args, argc, argv))
exit(rc_main); exit(rc_main);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(rc_main);
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(rc_main);
if (quit_monitord) { if (quit_monitord) {
int ret = EXIT_SUCCESS; int ret = EXIT_SUCCESS;

22
src/lxc/tools/lxc_snapshot.c
View File

@ -84,18 +84,18 @@ 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);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(EXIT_FAILURE);
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 (geteuid()) { if (geteuid()) {
if (access(my_args.lxcpath[0], O_RDONLY) < 0) { if (access(my_args.lxcpath[0], O_RDONLY) < 0) {

19
src/lxc/tools/lxc_start.c
View File

@ -189,15 +189,18 @@ int main(int argc, char *argv[])
else else
args = my_args.argv; args = my_args.argv;
log.name = my_args.name; /* Only create log if explicitly instructed */
log.file = my_args.log_file; if (my_args.log_file || my_args.log_priority) {
log.level = my_args.log_priority; log.name = my_args.name;
log.prefix = my_args.progname; log.file = my_args.log_file;
log.quiet = my_args.quiet; log.level = my_args.log_priority;
log.lxcpath = my_args.lxcpath[0]; log.prefix = my_args.progname;
log.quiet = my_args.quiet;
log.lxcpath = my_args.lxcpath[0];
if (lxc_log_init(&log)) if (lxc_log_init(&log))
exit(err); exit(err);
}
lxcpath = my_args.lxcpath[0]; lxcpath = my_args.lxcpath[0];
if (access(lxcpath, O_RDONLY) < 0) { if (access(lxcpath, O_RDONLY) < 0) {

19
src/lxc/tools/lxc_stop.c
View File

@ -104,15 +104,18 @@ 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);
log.name = my_args.name; /* Only create log if explicitly instructed */
log.file = my_args.log_file; if (my_args.log_file || my_args.log_priority) {
log.level = my_args.log_priority; log.name = my_args.name;
log.prefix = my_args.progname; log.file = my_args.log_file;
log.quiet = my_args.quiet; log.level = my_args.log_priority;
log.lxcpath = my_args.lxcpath[0]; log.prefix = my_args.progname;
log.quiet = my_args.quiet;
log.lxcpath = my_args.lxcpath[0];
if (lxc_log_init(&log)) if (lxc_log_init(&log))
exit(ret); exit(ret);
}
/* Set default timeout */ /* Set default timeout */
if (my_args.timeout == -2) { if (my_args.timeout == -2) {

23
src/lxc/tools/lxc_unfreeze.c
View File

@ -60,19 +60,18 @@ 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);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(EXIT_FAILURE);
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);
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) {

22
src/lxc/tools/lxc_wait.c
View File

@ -87,18 +87,18 @@ 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);
if (!my_args.log_file) /* Only create log if explicitly instructed */
my_args.log_file = "none"; 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; if (lxc_log_init(&log))
log.file = my_args.log_file; exit(EXIT_FAILURE);
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);
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)