diff --git a/internal/cryptocore/cryptocore.go b/internal/cryptocore/cryptocore.go index bd30029..d66f390 100644 --- a/internal/cryptocore/cryptocore.go +++ b/internal/cryptocore/cryptocore.go @@ -163,7 +163,7 @@ func (c *CryptoCore) Wipe() { w := c.AEADCipher.(wiper) w.Wipe() } else { - tlog.Debug.Print("CryptoCore.Wipe: Only nil'ing stdlib refs") + tlog.Debug.Printf("CryptoCore.Wipe: Only nil'ing stdlib refs") } // We have no access to the keys (or key-equivalents) stored inside the // Go stdlib. Best we can is to nil the references and force a GC. diff --git a/internal/fusefrontend/file_allocate_truncate.go b/internal/fusefrontend/file_allocate_truncate.go index 86aee8e..67254dc 100644 --- a/internal/fusefrontend/file_allocate_truncate.go +++ b/internal/fusefrontend/file_allocate_truncate.go @@ -39,7 +39,7 @@ var allocateWarnOnce sync.Once func (f *file) Allocate(off uint64, sz uint64, mode uint32) fuse.Status { if mode != FALLOC_DEFAULT && mode != FALLOC_FL_KEEP_SIZE { f := func() { - tlog.Warn.Print("fallocate: only mode 0 (default) and 1 (keep size) are supported") + tlog.Warn.Printf("fallocate: only mode 0 (default) and 1 (keep size) are supported") } allocateWarnOnce.Do(f) return fuse.Status(syscall.EOPNOTSUPP) diff --git a/internal/tlog/log.go b/internal/tlog/log.go index 720bb88..f6c0acf 100644 --- a/internal/tlog/log.go +++ b/internal/tlog/log.go @@ -53,7 +53,7 @@ type toggledLogger struct { prefix string postfix string - *log.Logger + Logger *log.Logger } func (l *toggledLogger) Printf(format string, v ...interface{}) { @@ -125,7 +125,7 @@ func (l *toggledLogger) SwitchToSyslog(p syslog.Priority) { if err != nil { Warn.Printf("SwitchToSyslog: %v", err) } else { - l.SetOutput(w) + l.Logger.SetOutput(w) } } diff --git a/mount.go b/mount.go index 9560efe..21a70af 100644 --- a/mount.go +++ b/mount.go @@ -89,7 +89,7 @@ func doMount(args *argContainer) { defer func() { err = sock.Close() if err != nil { - tlog.Warn.Print(err) + tlog.Warn.Printf("ctlsock close: %v", err) } }() } @@ -378,7 +378,7 @@ func handleSigint(srv *fuse.Server, mountpoint string) { <-ch err := srv.Unmount() if err != nil { - tlog.Warn.Print(err) + tlog.Warn.Printf("handleSigint: srv.Unmount returned %v", err) if runtime.GOOS == "linux" { // MacOSX does not support lazy unmount tlog.Info.Printf("Trying lazy unmount")