Ver código fonte

Merge pull request #11928 from crosbymichael/aufs-build-errors

Fix AUFS logrus build errors on import
Michael Crosby 10 anos atrás
pai
commit
446437d1a1
1 arquivos alterados com 3 adições e 3 exclusões
  1. 3 3
      daemon/graphdriver/aufs/aufs.go

+ 3 - 3
daemon/graphdriver/aufs/aufs.go

@@ -480,14 +480,14 @@ func useDirperm() bool {
 	enableDirpermLock.Do(func() {
 	enableDirpermLock.Do(func() {
 		base, err := ioutil.TempDir("", "docker-aufs-base")
 		base, err := ioutil.TempDir("", "docker-aufs-base")
 		if err != nil {
 		if err != nil {
-			log.Errorf("error checking dirperm1: %v", err)
+			logrus.Errorf("error checking dirperm1: %v", err)
 			return
 			return
 		}
 		}
 		defer os.RemoveAll(base)
 		defer os.RemoveAll(base)
 
 
 		union, err := ioutil.TempDir("", "docker-aufs-union")
 		union, err := ioutil.TempDir("", "docker-aufs-union")
 		if err != nil {
 		if err != nil {
-			log.Errorf("error checking dirperm1: %v", err)
+			logrus.Errorf("error checking dirperm1: %v", err)
 			return
 			return
 		}
 		}
 		defer os.RemoveAll(union)
 		defer os.RemoveAll(union)
@@ -498,7 +498,7 @@ func useDirperm() bool {
 		}
 		}
 		enableDirperm = true
 		enableDirperm = true
 		if err := Unmount(union); err != nil {
 		if err := Unmount(union); err != nil {
-			log.Errorf("error checking dirperm1: failed to unmount %v", err)
+			logrus.Errorf("error checking dirperm1: failed to unmount %v", err)
 		}
 		}
 	})
 	})
 	return enableDirperm
 	return enableDirperm