wait 15 seconds instead of forever and produce debug logs for further analyze

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
S.Çağlar Onur 2014-03-06 17:48:10 -05:00 committed by Serge Hallyn
parent 7c9a999558
commit 3afbcc4600

View File

@ -91,11 +91,15 @@ static void do_function(void *arguments)
} else if(strcmp(args->mode, "start") == 0) { } else if(strcmp(args->mode, "start") == 0) {
if (c->is_defined(c) && !c->is_running(c)) { if (c->is_defined(c) && !c->is_running(c)) {
c->want_daemonize(c, true); c->want_daemonize(c, true);
if (!quiet) {
c->set_config_item(c, "lxc.loglevel", "DEBUG");
c->set_config_item(c, "lxc.logfile", name);
}
if (!c->start(c, false, NULL)) { if (!c->start(c, false, NULL)) {
fprintf(stderr, "Starting the container (%s) failed...\n", name); fprintf(stderr, "Starting the container (%s) failed...\n", name);
goto out; goto out;
} }
if (!c->wait(c, "RUNNING", -1)) { if (!c->wait(c, "RUNNING", 15)) {
fprintf(stderr, "Waiting the container (%s) to start failed...\n", name); fprintf(stderr, "Waiting the container (%s) to start failed...\n", name);
goto out; goto out;
} }
@ -107,7 +111,7 @@ static void do_function(void *arguments)
fprintf(stderr, "Stopping the container (%s) failed...\n", name); fprintf(stderr, "Stopping the container (%s) failed...\n", name);
goto out; goto out;
} }
if (!c->wait(c, "STOPPED", -1)) { if (!c->wait(c, "STOPPED", 15)) {
fprintf(stderr, "Waiting the container (%s) to stop failed...\n", name); fprintf(stderr, "Waiting the container (%s) to stop failed...\n", name);
goto out; goto out;
} }