From 3cad67f65d823af5c4d16a58c836f1b675f7d88b Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Tue, 21 Oct 2014 15:00:25 +0800 Subject: [PATCH] daemon: resolve the graphdriver to show graphdriver is not always specified when the log printed, because it's provided in another thread. This patch will fix this. Signed-off-by: Qiang Huang Upstream-commit: 7cf322dffc5e9a4ea495ec08e0b0594cad01da92 Component: engine --- components/engine/docker/daemon.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/components/engine/docker/daemon.go b/components/engine/docker/daemon.go index 2f65878472..4a591ec5ea 100644 --- a/components/engine/docker/daemon.go +++ b/components/engine/docker/daemon.go @@ -45,6 +45,13 @@ func mainDaemon() { if err != nil { log.Fatal(err) } + log.Infof("docker daemon: %s %s; execdriver: %s; graphdriver: %s", + dockerversion.VERSION, + dockerversion.GITCOMMIT, + d.ExecutionDriver().Name(), + d.GraphDriver().String(), + ) + if err := d.Install(eng); err != nil { log.Fatal(err) } @@ -58,13 +65,6 @@ func mainDaemon() { log.Fatal(err) } }() - // TODO actually have a resolved graphdriver to show? - log.Infof("docker daemon: %s %s; execdriver: %s; graphdriver: %s", - dockerversion.VERSION, - dockerversion.GITCOMMIT, - daemonCfg.ExecDriver, - daemonCfg.GraphDriver, - ) // Serve api job := eng.Job("serveapi", flHosts...)