docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix log to logrus 

Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2015-07-28 19:58:50 -07:00
parent c19a00d4cb
commit 2bf73c4b1a
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/graphdriver/zfs/zfs.go
View File

@ -13,7 +13,7 @@ import (
"syscall" "syscall"
"time" "time"
log "github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/docker/docker/pkg/parsers" "github.com/docker/docker/pkg/parsers"
@ -33,20 +33,20 @@ func init() {
type Logger struct{} type Logger struct{}
func (*Logger) Log(cmd []string) { func (*Logger) Log(cmd []string) {
log.Debugf("[zfs] %s", strings.Join(cmd, " ")) logrus.Debugf("[zfs] %s", strings.Join(cmd, " "))
} }
func Init(base string, opt []string) (graphdriver.Driver, error) { func Init(base string, opt []string) (graphdriver.Driver, error) {
var err error var err error
if _, err := exec.LookPath("zfs"); err != nil { if _, err := exec.LookPath("zfs"); err != nil {
log.Debugf("[zfs] zfs command is not available: %v", err) logrus.Debugf("[zfs] zfs command is not available: %v", err)
return nil, graphdriver.ErrPrerequisites return nil, graphdriver.ErrPrerequisites
} }
file, err := os.OpenFile("/dev/zfs", os.O_RDWR, 600) file, err := os.OpenFile("/dev/zfs", os.O_RDWR, 600)
if err != nil { if err != nil {
log.Debugf("[zfs] cannot open /dev/zfs: %v", err) logrus.Debugf("[zfs] cannot open /dev/zfs: %v", err)
return nil, graphdriver.ErrPrerequisites return nil, graphdriver.ErrPrerequisites
} }
defer file.Close() defer file.Close()
@ -133,7 +133,7 @@ func lookupZfsDataset(rootdir string) (string, error) {
} }
for _, m := range mounts { for _, m := range mounts {
if err := syscall.Stat(m.Mountpoint, &stat); err != nil { if err := syscall.Stat(m.Mountpoint, &stat); err != nil {
log.Debugf("[zfs] failed to stat '%s' while scanning for zfs mount: %v", m.Mountpoint, err) logrus.Debugf("[zfs] failed to stat '%s' while scanning for zfs mount: %v", m.Mountpoint, err)
continue // may fail on fuse file systems continue // may fail on fuse file systems
} }
@ -277,7 +277,7 @@ func (d *Driver) Get(id, mountLabel string) (string, error) {
mountpoint := d.MountPath(id) mountpoint := d.MountPath(id)
filesystem := d.ZfsPath(id) filesystem := d.ZfsPath(id)
options := label.FormatMountLabel("", mountLabel) options := label.FormatMountLabel("", mountLabel)
log.Debugf(`[zfs] mount("%s", "%s", "%s")`, filesystem, mountpoint, options) logrus.Debugf(`[zfs] mount("%s", "%s", "%s")`, filesystem, mountpoint, options)
// Create the target directories if they don't exist // Create the target directories if they don't exist
if err := os.MkdirAll(mountpoint, 0755); err != nil && !os.IsExist(err) { if err := os.MkdirAll(mountpoint, 0755); err != nil && !os.IsExist(err) {
@ -294,7 +294,7 @@ func (d *Driver) Get(id, mountLabel string) (string, error) {
func (d *Driver) Put(id string) error { func (d *Driver) Put(id string) error {
mountpoint := d.MountPath(id) mountpoint := d.MountPath(id)
log.Debugf(`[zfs] unmount("%s")`, mountpoint) logrus.Debugf(`[zfs] unmount("%s")`, mountpoint)
if err := mount.Unmount(mountpoint); err != nil { if err := mount.Unmount(mountpoint); err != nil {
return fmt.Errorf("error unmounting to %s: %v", mountpoint, err) return fmt.Errorf("error unmounting to %s: %v", mountpoint, err)

4
daemon/graphdriver/zfs/zfs_freebsd.go
View File

@ -5,7 +5,7 @@ import (
"strings" "strings"
"syscall" "syscall"
log "github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
) )
@ -17,7 +17,7 @@ func checkRootdirFs(rootdir string) error {
// on FreeBSD buf.Fstypename contains ['z', 'f', 's', 0 ... ] // on FreeBSD buf.Fstypename contains ['z', 'f', 's', 0 ... ]
if (buf.Fstypename[0] != 122) || (buf.Fstypename[1] != 102) || (buf.Fstypename[2] != 115) || (buf.Fstypename[3] != 0) { if (buf.Fstypename[0] != 122) || (buf.Fstypename[1] != 102) || (buf.Fstypename[2] != 115) || (buf.Fstypename[3] != 0) {
log.Debugf("[zfs] no zfs dataset found for rootdir '%s'", rootdir) logrus.Debugf("[zfs] no zfs dataset found for rootdir '%s'", rootdir)
return graphdriver.ErrPrerequisites return graphdriver.ErrPrerequisites
} }

4
daemon/graphdriver/zfs/zfs_linux.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"syscall" "syscall"
log "github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
) )
@ -15,7 +15,7 @@ func checkRootdirFs(rootdir string) error {
} }
if graphdriver.FsMagic(buf.Type) != graphdriver.FsMagicZfs { if graphdriver.FsMagic(buf.Type) != graphdriver.FsMagicZfs {
log.Debugf("[zfs] no zfs dataset found for rootdir '%s'", rootdir) logrus.Debugf("[zfs] no zfs dataset found for rootdir '%s'", rootdir)
return graphdriver.ErrPrerequisites return graphdriver.ErrPrerequisites
} }

4
pkg/archive/copy.go
View File

@ -10,7 +10,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
log "github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
) )
// Errors used or returned by this file. // Errors used or returned by this file.
@ -121,7 +121,7 @@ func TarResource(sourcePath string) (content Archive, err error) {
filter := []string{sourceBase} filter := []string{sourceBase}
log.Debugf("copying %q from %q", sourceBase, sourceDir) logrus.Debugf("copying %q from %q", sourceBase, sourceDir)
return TarWithOptions(sourceDir, &TarOptions{ return TarWithOptions(sourceDir, &TarOptions{
Compression: Uncompressed, Compression: Uncompressed,