add some TRACE/ERROR reporting

The errors in execute_start are important because nothing actually prints
out what error if any there was in these cases, so you're left with an
empty log.

The TRACE logs are simply to tell you which version of start lxc chose to
invoke: exec or start.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
This commit is contained in:
Tycho Andersen 2018-05-08 09:43:19 -06:00
parent f52624fa56
commit b2efeb0bb9
2 changed files with 8 additions and 2 deletions

View File

@ -58,11 +58,15 @@ static int execute_start(struct lxc_handler *handler, void* data)
argc_add += 2;
argv = malloc((argc + argc_add) * sizeof(*argv));
if (!argv)
if (!argv) {
SYSERROR("Allocating init args failed");
goto out1;
}
if (!my_args->init_path)
if (!my_args->init_path) {
ERROR("Init path missing");
goto out2;
}
argv[i++] = my_args->init_path;
@ -139,6 +143,7 @@ int lxc_execute(const char *name, char *const argv[], int quiet,
{
struct execute_args args = {.argv = argv, .quiet = quiet};
TRACE("Doing lxc_execute");
handler->conf->is_execute = 1;
return __lxc_start(name, handler, &execute_start_ops, &args, lxcpath,
backgrounded, error_num);

View File

@ -1971,6 +1971,7 @@ int lxc_start(const char *name, char *const argv[], struct lxc_handler *handler,
.argv = argv,
};
TRACE("Doing lxc_start");
return __lxc_start(name, handler, &start_ops, &start_arg, lxcpath, backgrounded, error_num);
}