[lxc-devel] [PATCH] log: use the right size for timestamp formatting

[Tycho Andersen]

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
---
 src/lxc/confile.c | 2 ++
 src/lxc/criu.c    | 7 ++-----
 src/lxc/log.c     | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index c2eaaa6..9ed9e38 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2119,6 +2119,8 @@ static int lxc_get_cgroup_entry(struct lxc_conf *c, char *retv, int inlen,
 	int all = 0;
 	struct lxc_list *it;
 
+	ERROR("TYCHO: lxc_get_cgroup_entry %s %s\n", retv, key);
+
 	if (!retv)
 		inlen = 0;
 	else
diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index 695a763..759db69 100644
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -348,13 +348,10 @@ bool criu_ok(struct lxc_container *c)
 		return false;
 	}
 
-	if (c->lxc_conf->tty != 0) {
-		ERROR("lxc.tty must be 0\n");
-		return false;
-	}
-
+	ERROR("TYCHO: testing %d cgs\n", lxc_list_len(&c->lxc_conf->cgroup));
 	lxc_list_for_each(it, &c->lxc_conf->cgroup) {
 		struct lxc_cgroup *cg = it->elem;
+		ERROR("TYCHO: subsystem: %s, value: %s\n", cg->subsystem, cg->value);
 		if (strcmp(cg->subsystem, "devices.deny") == 0 &&
 				strcmp(cg->value, "c 5:1 rwm") == 0) {
 
diff --git a/src/lxc/log.c b/src/lxc/log.c
index f44a1d9..20be5ac 100644
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -90,7 +90,7 @@ static int log_append_logfile(const struct lxc_log_appender *appender,
 		return 0;
 
 	t = localtime(&event->timestamp.tv_sec);
-	strftime(date, sizeof(LXC_LOG_DATEFOMAT_SIZE), "%Y%m%d%H%M%S", t);
+	strftime(date, sizeof(date), "%Y%m%d%H%M%S", t);
 	ms = event->timestamp.tv_usec / 1000;
 	n = snprintf(buffer, sizeof(buffer),
 		     "%15s %10s.%03d %-8s %s - %s:%s:%d - ",
-- 
2.6.2