Ver código fonte

Merge pull request #8510 from hqhq/graphdriver_bug

daemon: resolve the graphdriver to show
Jessie Frazelle 10 anos atrás
pai
commit
793fb26bff
1 arquivos alterados com 7 adições e 7 exclusões
  1. 7 7
      docker/daemon.go

+ 7 - 7
docker/daemon.go

@@ -52,6 +52,13 @@ func mainDaemon() {
 		if err != nil {
 		if err != nil {
 			log.Fatal(err)
 			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 {
 		if err := d.Install(eng); err != nil {
 			log.Fatal(err)
 			log.Fatal(err)
 		}
 		}
@@ -65,13 +72,6 @@ func mainDaemon() {
 			log.Fatal(err)
 			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
 	// Serve api
 	job := eng.Job("serveapi", flHosts...)
 	job := eng.Job("serveapi", flHosts...)